Author: jleroux
Date: Tue Dec 30 01:24:32 2008 New Revision: 730077 URL: http://svn.apache.org/viewvc?rev=730077&view=rev Log: Update (using copy-dtds) Modified: ofbiz/site/dtds/simple-methods.xsd Modified: ofbiz/site/dtds/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=730077&r1=730076&r2=730077&view=diff ============================================================================== --- ofbiz/site/dtds/simple-methods.xsd (original) +++ ofbiz/site/dtds/simple-methods.xsd Tue Dec 30 01:24:32 2008 @@ -114,19 +114,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field"> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the field to put value in. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - Name of the related map. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>Name of the field to put value in.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="type"> <xs:annotation> @@ -453,25 +442,13 @@ </xs:element> <xs:attributeGroup name="attlist.set-service-fields"> <xs:attribute type="xs:string" name="service-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the service from which take all the incoming files, or all incoming attributes. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>Name of the service to get all the incoming attributes (parameters) from.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name" use="required"> - <xs:annotation> - <xs:documentation> - Incoming map to copy fields from. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="map" use="required"> + <xs:annotation><xs:documentation>Incoming map to copy fields from.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-map-name" use="required"> - <xs:annotation> - <xs:documentation> - Map to copy to fields to. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="to-map" use="required"> + <xs:annotation><xs:documentation>Map to copy to fields to.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="error-list-name" default="error_list"> <xs:annotation> @@ -717,23 +694,12 @@ <xs:annotation> <xs:documentation> Name of the result. May be used for the field-name. If you don't specify a field-name, - that's the name of the variable that will be created in the current context for the value of that result. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - Optionnal map name. + this will be name of the variable that will be created in the current context for the value of that result. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="field-name"> - <xs:annotation> - <xs:documentation> - Optionnal field name. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field"> + <xs:annotation><xs:documentation>Optional name of target field. If empty will default to result-name.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="result-to-request"> @@ -962,21 +928,13 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.call-object-method"> - <xs:attribute type="xs:string" name="obj-field-name" use="required"> + <xs:attribute type="xs:string" name="obj-field" use="required"> <xs:annotation> <xs:documentation> The name of the field the object is in that has the method to be called. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="obj-map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field of the object is in that has the method to be called. - If this is not specified the environment will be used to find the field in. - </xs:documentation> - </xs:annotation> - </xs:attribute> <xs:attribute type="xs:string" name="method-name" use="required"> <xs:annotation> <xs:documentation> @@ -984,7 +942,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-field-name"> + <xs:attribute type="xs:string" name="ret-field"> <xs:annotation> <xs:documentation> The name of the field to put the result in. @@ -992,14 +950,6 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field of the return value is in. - If not specified but the field name is then the environment will be used to find the field in. - </xs:documentation> - </xs:annotation> - </xs:attribute> </xs:attributeGroup> <xs:element name="call-class-method" substitutionGroup="CallOperations"> <xs:annotation> @@ -1050,27 +1000,18 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-field-name"> + <xs:attribute type="xs:string" name="ret-field"> <xs:annotation> <xs:documentation> The name of the field to put the result in. If not specified any return value will be ignored. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field of the return value is in. - If not specified but the field name is then the environment will be used to find the field in. - </xs:documentation> - </xs:annotation> - </xs:attribute> </xs:attributeGroup> <xs:element name="create-object" substitutionGroup="CallOperations"> <xs:annotation> <xs:documentation> - Creates an object of the given class and if the field-name is specified saves it in that field. - + Creates an object of the given class and if the field attribute is specified saves it in that field. The string and field sub-elements are passed to the constructor method as arguments in the order they are specified. If the sub-elements do not match the constructor method arguments an error will be returned. </xs:documentation> @@ -1105,7 +1046,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="field-name"> + <xs:attribute type="xs:string" name="field"> <xs:annotation> <xs:documentation> The name of a field to put the new object in. @@ -1113,14 +1054,6 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field will go in. - If not specified the field will be put in the environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> </xs:attributeGroup> <!-- Operations to copy map fields in the current env to context specific containers --> <!-- Event specific operations --> @@ -1130,33 +1063,17 @@ The field-to-request tag copies a field from a map to the specified servlet request attribute. The tag is only used when the simple-method is called as an event, it is ignored otherwise. </xs:documentation> - </xs:annotation> + </xs:annotation> <xs:complexType> <xs:attributeGroup ref="attlist.field-to-request"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-request"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The context name of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="request-name"> - <xs:annotation> - <xs:documentation> - The name of the request attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the request attribute to use. Defaults to the value of field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="field-to-session" substitutionGroup="EventOperations"> @@ -1165,33 +1082,17 @@ The field-to-session tag copies a field from a map to the specified servlet session attribute. The tag is only used when the simple-method is called as an event, it is ignored otherwise. </xs:documentation> - </xs:annotation> + </xs:annotation> <xs:complexType> <xs:attributeGroup ref="attlist.field-to-session"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-session"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The context name of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="session-name"> - <xs:annotation> - <xs:documentation> - The name of the session attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the session attribute to use. Defaults to the value of field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="request-to-field" substitutionGroup="EventOperations"> @@ -1206,20 +1107,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.request-to-field"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to set the field in the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The context name of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default"> <xs:annotation> @@ -1230,12 +1119,7 @@ </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="request-name"> - <xs:annotation> - <xs:documentation> - The name of the request attribute to use. - Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the request attribute to use. Defaults to the value of the field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="request-parameters-to-list" substitutionGroup="EventOperations"> @@ -1278,20 +1162,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.session-to-field"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to set the field in the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the map field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default"> <xs:annotation> @@ -1304,7 +1176,7 @@ <xs:attribute type="xs:string" name="session-name"> <xs:annotation> <xs:documentation> - The name of the session attribute to use. Defaults to the field-name. + The name of the session attribute to use. Defaults to the value of field attribute. </xs:documentation> </xs:annotation> </xs:attribute> @@ -1331,11 +1203,7 @@ </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="property" use="required"> - <xs:annotation> - <xs:documentation> - The property whose value will be put in the field. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The property whose value will be put in the field.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default"> <xs:annotation> @@ -1345,19 +1213,11 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="session-name"> - <xs:annotation> - <xs:documentation> - The name of the session attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the session attribute to use. Defaults to the value of field attribute</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <!-- Service specific operations --> @@ -1373,27 +1233,11 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-result"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the map field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="result-name"> - <xs:annotation> - <xs:documentation> - The name of the request attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the result Map name/key to use. Defaults to the value of field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <!-- Environment specific operations --> @@ -1408,14 +1252,10 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.map-to-map"> - <xs:attribute type="xs:string" name="map-name" use="required"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment the fields will come from. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="map" use="required"> + <xs:annotation><xs:documentation>The name of the map in the method environment the fields will come from.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-map-name"> + <xs:attribute type="xs:string" name="to-map"> <xs:annotation> <xs:documentation> The name of the map in the method environment the fields will go to. @@ -1425,85 +1265,40 @@ </xs:attribute> </xs:attributeGroup> <xs:element name="field-to-list" substitutionGroup="EnvOperations"> - <xs:annotation> - <xs:documentation> - The field-to-list tag appends a field to the specified list. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="attlist.field-to-list"/> - </xs:complexType> + <xs:annotation><xs:documentation>The field-to-list tag appends a field to the specified list.</xs:documentation></xs:annotation> + <xs:complexType><xs:attributeGroup ref="attlist.field-to-list"/></xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-list"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the map field to use.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="list-name" use="required"> - <xs:annotation> - <xs:documentation> - The name of the list in the method environment that the object will be appended to. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="list" use="required"> + <xs:annotation><xs:documentation>The name of the list in the method environment that the object will be appended to.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="list-to-list" substitutionGroup="EnvOperations"> - <xs:annotation> - <xs:documentation> - Copy a list to another list. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="attlist.list-to-list"/> - </xs:complexType> + <xs:annotation><xs:documentation>Copy a list to another list.</xs:documentation></xs:annotation> + <xs:complexType><xs:attributeGroup ref="attlist.list-to-list"/></xs:complexType> </xs:element> <xs:attributeGroup name="attlist.list-to-list"> - <xs:attribute type="xs:string" name="list-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the list to copy from - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="list" use="required"> + <xs:annotation><xs:documentation>Name of the list to copy from</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-list-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the list to copy to. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="to-list" use="required"> + <xs:annotation><xs:documentation>Name of the list to copy to.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="order-map-list" substitutionGroup="EnvOperations"> - <xs:annotation> - <xs:documentation> - Sort a list : ordered by fields names given in order-by attribute. - </xs:documentation> + <xs:annotation><xs:documentation>Sort a List containing Maps: order by fields names given in order-by sub-element.</xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="order-by"/> - </xs:sequence> + <xs:sequence><xs:element maxOccurs="unbounded" ref="order-by"/></xs:sequence> <xs:attributeGroup ref="attlist.order-map-list"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.order-map-list"> - <xs:attribute type="xs:string" name="list-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the list ordered by fields names given in order-by attribute. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="list" use="required"> + <xs:annotation><xs:documentation>Name of the list to be sorted.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="set" substitutionGroup="EnvOperations"> @@ -1632,7 +1427,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.string-append"> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The field that you want string-append to operate on. @@ -1643,13 +1438,6 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="string" use="required"> <xs:annotation> <xs:documentation> @@ -1657,7 +1445,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="arg-list-name"> + <xs:attribute type="xs:string" name="arg-list"> <xs:annotation> <xs:documentation> arg-list-name is used to insert values from a list into @@ -1715,14 +1503,14 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> List to add string to. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="arg-list-name"> + <xs:attribute type="xs:string" name="arg-list"> <xs:annotation> <xs:documentation> arg-list-name is used to insert values from a list into @@ -1739,7 +1527,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="message-field-name"> + <xs:attribute type="xs:string" name="message-field"> <xs:annotation> <xs:documentation> To insert a message above a field (used in conjunction with @fieldErrors FTL macro) @@ -1758,15 +1546,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.to-string"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name (key) of the map field to use. @@ -1799,15 +1579,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.clear-field"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name (key) of the map field to use. @@ -1826,14 +1598,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.first-from-list"> - <xs:attribute type="xs:string" name="entry-name" use="required"> + <xs:attribute type="xs:string" name="entry" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that will contain the first entry in the list. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the list to get the first entry from. @@ -1911,7 +1683,7 @@ </xs:annotation> </xs:attribute> </xs:attributeGroup> - <xs:element name="sequenced-id-to-env" substitutionGroup="EntityMiscOperations"> + <xs:element name="sequenced-id" substitutionGroup="EntityMiscOperations"> <xs:annotation> <xs:documentation> The sequenced-id-to-env tag gets a sequenced ID from the Entity Engine (through the delegator) and puts it in the specified method environment field. @@ -1919,10 +1691,10 @@ </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attributeGroup ref="attlist.sequenced-id-to-env"/> + <xs:attributeGroup ref="attlist.sequenced-id"/> </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.sequenced-id-to-env"> + <xs:attributeGroup name="attlist.sequenced-id"> <xs:attribute type="xs:string" name="sequence-name" use="required"> <xs:annotation> <xs:documentation> @@ -1931,7 +1703,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="env-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field the sequenced ID will be put in. @@ -1984,7 +1756,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.make-next-seq-id"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> Specify the name of the entity for a sequenced-id-to-env preparing the primarySequencedId. @@ -2123,17 +1895,17 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name" use="required"> + <xs:attribute type="xs:string" name="map" use="required"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> - The name of the method environment field that contains the GenericValue object. + The name of the method environment field that will contain the GenericValue object. </xs:documentation> </xs:annotation> </xs:attribute> @@ -2181,14 +1953,14 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name" use="required"> + <xs:attribute type="xs:string" name="map" use="required"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="order-by-list-name"> + <xs:attribute type="xs:string" name="order-by-list"> <xs:annotation> <xs:documentation> This will be a list sitting in the context that has string entries in it for each field that you want it to order by/ @@ -2232,10 +2004,10 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> - The name of the method environment field that contains the list of GenericValue objects. + The name of the method environment field that will contain the list of GenericValue objects. </xs:documentation> </xs:annotation> </xs:attribute> @@ -2270,14 +2042,14 @@ <xs:attribute name="entity-name" type="xs:string" use="required"> <xs:annotation> <xs:documentation> - Name of the entity to look for. + Name of the entity to query on. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="value-name" type="xs:string" use="required"> + <xs:attribute name="value-field" type="xs:string" use="required"> <xs:annotation> <xs:documentation> - Name of the variable to put entity in. + Name of the variable to put result record in. </xs:documentation> </xs:annotation> </xs:attribute> @@ -2318,18 +2090,10 @@ <xs:sequence> <xs:element maxOccurs="unbounded" ref="field-map"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field"> - <xs:annotation> - <xs:documentation> - Specify fields to select, otherwise all fields will be selected. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>Specify fields to select, otherwise all fields will be selected.</xs:documentation></xs:annotation> </xs:element> <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by"> - <xs:annotation> - <xs:documentation> - Defines fields to order list by. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>Defines fields to order list by.</xs:documentation></xs:annotation> </xs:element> <xs:choice minOccurs="0"> <xs:element ref="limit-range"/> @@ -2348,7 +2112,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="use-cache" default="false"> + <xs:attribute name="use-cache" type="xs:string" default="false"> <xs:annotation> <xs:documentation> Specifies whether or not the delegator's cache should be searched before going to the database. @@ -2373,7 +2137,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="list-name" type="xs:string" use="required"> + <xs:attribute name="list" type="xs:string" use="required"> <xs:annotation> <xs:documentation> Name of the list where to put results. @@ -2468,7 +2232,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="list-name" type="xs:string" use="required"> + <xs:attribute name="list" type="xs:string" use="required"> <xs:annotation> <xs:documentation> Name of the list where to put results. @@ -2587,10 +2351,10 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="env-name" type="xs:string"> + <xs:attribute name="from-field" type="xs:string"> <xs:annotation> <xs:documentation> - Name of variable to apply operator on, combined with field-name. + Name of field (variable) to apply operator on, along with field-name. </xs:documentation> </xs:annotation> </xs:attribute> @@ -2790,7 +2554,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="env-name"> + <xs:attribute type="xs:string" name="from-field"> <xs:annotation> <xs:documentation> Name of the variable in the context. @@ -2848,10 +2612,10 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="count-name" type="xs:string" use="required"> + <xs:attribute name="count-field" type="xs:string" use="required"> <xs:annotation> <xs:documentation> - Name of the variable to put result of the count in. + Name of the field (variable) to put result of the count in. </xs:documentation> </xs:annotation> </xs:attribute> @@ -2870,7 +2634,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.get-related-one"> - <xs:attribute name="value-name" type="xs:string" use="required"> + <xs:attribute name="value-field" type="xs:string" use="required"> <xs:annotation> <xs:documentation> Name of a generic value sitting in the context from where you want to get a related-one generic value. @@ -2884,7 +2648,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="use-cache" default="false"> + <xs:attribute name="use-cache" type="xs:string" default="false"> <xs:annotation> <xs:documentation> Specifies whether or not the delegator's cache should be searched before going to the database. @@ -2893,7 +2657,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-value-name" use="required"> + <xs:attribute name="to-value-field" type="xs:string" use="required"> <xs:annotation> <xs:documentation> Name of a generic value where to put the result. @@ -2922,7 +2686,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.get-related"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> Name of a generic value sitting in the context from where you want to get a related generic value. @@ -2936,7 +2700,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> + <xs:attribute type="xs:string" name="map"> <xs:annotation> <xs:documentation> Name of a map that will restrain the query further, @@ -2944,7 +2708,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="order-by-list-name"> + <xs:attribute type="xs:string" name="order-by-list"> <xs:annotation> <xs:documentation> This will be a list sitting in the context that has string entries in it for each field that you want it to order by/ @@ -2963,7 +2727,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> Name of a list where to put the result in. @@ -2983,14 +2747,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.order-value-list"> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> Name of the list of generic value objects that we want to sort. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-list-name"> + <xs:attribute type="xs:string" name="to-list"> <xs:annotation> <xs:documentation> Name of the output list. If it is empty, as it is optional, it will simply use the list-name. @@ -2998,7 +2762,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="order-by-list-name" use="required"> + <xs:attribute type="xs:string" name="order-by-list" use="required"> <xs:annotation> <xs:documentation> This will be a list sitting in the context that has string entries in it for each field that you want it to order by. @@ -3020,14 +2784,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.filter-list-by-and"> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the list of GenericValue objects. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-list-name"> + <xs:attribute type="xs:string" name="to-list"> <xs:annotation> <xs:documentation> The name of the method environment field the filtered list will be put into. @@ -3035,7 +2799,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> + <xs:attribute type="xs:string" name="map"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. @@ -3055,14 +2819,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.filter-list-by-date"> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the list of GenericValue objects. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-list-name"> + <xs:attribute type="xs:string" name="to-list"> <xs:annotation> <xs:documentation> The name of the method environment field the filtered list will be put into. @@ -3070,7 +2834,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="valid-date-name"> + <xs:attribute type="xs:string" name="valid-date"> <xs:annotation> <xs:documentation> The name of a field in the method environment date to filter by. @@ -3122,7 +2886,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.make-value"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the GenericValue object. @@ -3136,7 +2900,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> + <xs:attribute type="xs:string" name="map"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. @@ -3156,14 +2920,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.clone-value"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the GenericValue object. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="new-value-name" use="required"> + <xs:attribute type="xs:string" name="new-value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that will contain the new GenericValue object. @@ -3183,7 +2947,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.create-value"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the GenericValue object. @@ -3229,7 +2993,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.store-value"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the GenericValue object. @@ -3261,7 +3025,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.refresh-value"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> Name of the value to refresh from database. @@ -3294,7 +3058,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.remove-value"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the GenericValue object. @@ -3351,7 +3115,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.remove-related"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> Name of a generic value to remove all related records. @@ -3398,7 +3162,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name" use="required"> + <xs:attribute type="xs:string" name="map" use="required"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. @@ -3438,7 +3202,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> + <xs:attribute type="xs:string" name="map"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. @@ -3470,14 +3234,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.set-pk-fields"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the GenericValue object. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> + <xs:attribute type="xs:string" name="map"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. @@ -3510,14 +3274,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.set-nonpk-fields"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the GenericValue object. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> + <xs:attribute type="xs:string" name="map"> <xs:annotation> <xs:documentation> The name of a map in the method environment that will be used for the entity fields. @@ -3551,7 +3315,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.store-list"> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the list of GenericValue objects. @@ -3584,7 +3348,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.remove-list"> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the list of GenericValue objects. @@ -3623,14 +3387,14 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.iterate"> - <xs:attribute type="xs:string" name="entry-name" use="required"> + <xs:attribute type="xs:string" name="entry" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that will contain each entry as we iterate through the list. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="list-name" use="required"> + <xs:attribute type="xs:string" name="list" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the list to iterate over. @@ -3656,21 +3420,21 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.iterate-map"> - <xs:attribute type="xs:string" name="key-name" use="required"> + <xs:attribute type="xs:string" name="key" use="required"> <xs:annotation> <xs:documentation> Name of the variable to put the key. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value" use="required"> <xs:annotation> <xs:documentation> Name of the variable to put the value in. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name" use="required"> + <xs:attribute type="xs:string" name="map" use="required"> <xs:annotation> <xs:documentation> Name of the map to use. @@ -4063,18 +3827,10 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.if-validate-method"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the method environment field that contains the map that the field to be validated will come from. - If not specified the field-name will be treated as a method environment field name (an env-name). - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> - The name of the map field that will be validated. + The name of the field (variable) that will be validated. </xs:documentation> </xs:annotation> </xs:attribute> @@ -4125,15 +3881,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.if-instance-of"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the method environment field that contains the map that the field to be validated will come from. - If not specified the field-name will be treated as a method environment field name (an env-name). - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name of the map field that will be validated as being an instance of the named class. @@ -4294,15 +4042,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.if-regexp"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the method environment field that contains the map that the field to be validated will come from. - If not specified the field-name will be treated as a method environment field name (an env-name). - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name of the map field that will be compared. @@ -4564,21 +4304,13 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.check-id"> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name of the field that contains the ID value to check. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the Map that contains the field. - If not specified the environment will be used to find the field. - </xs:documentation> - </xs:annotation> - </xs:attribute> <xs:attribute type="xs:string" name="error-list-name" default="error_list"> <xs:annotation> <xs:documentation> @@ -4647,7 +4379,7 @@ </xs:annotation> </xs:attribute> </xs:attributeGroup> - <xs:element name="now-timestamp-to-env" substitutionGroup="OtherOperations"> + <xs:element name="now-timestamp" substitutionGroup="OtherOperations"> <xs:annotation> <xs:documentation> The now-timestamp-to-env tag creates a java.sql.Timestamp object with the current date and time in it and puts it in a field in the method environment. @@ -4658,7 +4390,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.now-timestamp-to-env"> - <xs:attribute type="xs:string" name="env-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field the timestamp will be put in. @@ -4676,7 +4408,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.now-date-to-env"> - <xs:attribute type="xs:string" name="env-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field the date will be put in. @@ -4709,15 +4441,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation> <xs:documentation> The name (key) of the map field to use. @@ -4759,7 +4483,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.set-current-user-login"> - <xs:attribute type="xs:string" name="value-name" use="required"> + <xs:attribute type="xs:string" name="value-field" use="required"> <xs:annotation> <xs:documentation> The name of the method environment field that contains the UserLogin GenericValue object. @@ -4796,15 +4520,7 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.calculate"> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> + <xs:attribute type="xs:string" name="field" use="required"> <xs:annotation><xs:documentation>The name (key) of the map (or env if map-name is empty) field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute name="type" default="Double"> @@ -4884,15 +4600,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment. - If not specified the field-name will be used to get the field from the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name"> + <xs:attribute type="xs:string" name="field"> <xs:annotation> <xs:documentation> The name (key) of the map field to use. |
Free forum by Nabble | Edit this page |