svn commit: r730098 [6/9] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/scr...

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 03:28:24 2008
@@ -106,7 +106,7 @@
     <!-- InventoryItem methods -->
     <simple-method method-name="createInventoryItem" short-description="Create an InventoryItem">
 
-        <make-value value-name="inventoryItem" entity-name="InventoryItem"/>
+        <make-value value-field="inventoryItem" entity-name="InventoryItem"/>
         <!-- TODO: make sure availableToPromiseTotal and quantityOnHandTotal are not changed -->
         <set-nonpk-fields map-name="parameters" value-name="inventoryItem"/>
 
@@ -224,7 +224,7 @@
 
     <simple-method method-name="updateInventoryItem" short-description="Update an InventoryItem">
 
-        <make-value entity-name="InventoryItem" value-name="lookupPKMap"/>
+        <make-value entity-name="InventoryItem" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <if-empty field="lookedUpValue.ownerPartyId">
@@ -267,7 +267,7 @@
             <store-value value-name="oldInventoryItemStatus"/>
         </if-not-empty>
         
-        <make-value value-name="inventoryItemStatus" entity-name="InventoryItemStatus"/>
+        <make-value value-field="inventoryItemStatus" entity-name="InventoryItemStatus"/>
         <set-nonpk-fields map-name="parameters" value-name="inventoryItemStatus"/>
         <set-pk-fields map-name="parameters" value-name="inventoryItemStatus"/>
         <set field="inventoryItemStatus.statusDatetime" from-field="nowTimestamp"/>
@@ -282,7 +282,7 @@
     </simple-method>
 
     <simple-method method-name="createInventoryItemDetail" short-description="Create an InventoryItemDetail">
-        <make-value value-name="newEntity" entity-name="InventoryItemDetail"/>
+        <make-value value-field="newEntity" entity-name="InventoryItemDetail"/>
 
         <set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/>
         <!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-name="newEntity" increment-by="1" numeric-padding="4"/> -->
@@ -386,7 +386,7 @@
                 <condition-expr field-name="oldAvailableToPromise" operator="not-equals" value=""/>
             </condition-list>
         </entity-condition>
-        <iterate list-name="inventoryItemList" entry-name="inventoryItem">
+        <iterate list="inventoryItemList" entry="inventoryItem">
             <set from-field="inventoryItem" field="callServiceMap.inventoryItem"/>
             <call-service service-name="updateOldInventoryToDetailSingle" in-map-name="callServiceMap"/>
             <clear-field field-name="callServiceMap.inventoryItem"/>
@@ -469,7 +469,7 @@
     <simple-method method-name="createInventoryItemVariance" short-description="Create an InventoryItemVariance">
 
         <!-- add changes to availableToPromise and quantityOnHand -->
-        <make-value value-name="inventoryItemLookup" entity-name="InventoryItem"/>
+        <make-value value-field="inventoryItemLookup" entity-name="InventoryItem"/>
         <set-pk-fields map-name="parameters" value-name="inventoryItemLookup"/>
         <find-by-primary-key map-name="inventoryItemLookup" value-name="inventoryItem"/>
 
@@ -487,7 +487,7 @@
         <set from-field="parameters.comments" field="createDetailMap.description"/>
         <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
 
-        <make-value value-name="newEntity" entity-name="InventoryItemVariance"/>
+        <make-value value-field="newEntity" entity-name="InventoryItemVariance"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -497,7 +497,7 @@
     </simple-method>
     <simple-method method-name="createPhysicalInventory" short-description="Create a PhysicalInventory">
 
-        <make-value value-name="newEntity" entity-name="PhysicalInventory"/>
+        <make-value value-field="newEntity" entity-name="PhysicalInventory"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <if-empty field="newEntity.physicalInventoryDate">
@@ -526,14 +526,14 @@
     <!-- ProductFacility methods -->
     <simple-method method-name="createProductFacility" short-description="Create a ProductFacility">
 
-        <make-value value-name="newEntity" entity-name="ProductFacility"/>
+        <make-value value-field="newEntity" entity-name="ProductFacility"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateProductFacility" short-description="Update a ProductFacility">
 
-        <make-value entity-name="ProductFacility" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductFacility" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -541,7 +541,7 @@
     </simple-method>
     <simple-method method-name="deleteProductFacility" short-description="Delete a ProductFacility">
 
-        <make-value entity-name="ProductFacility" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductFacility" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -550,14 +550,14 @@
     <!-- ProductFacilityLocation methods -->
     <simple-method method-name="createProductFacilityLocation" short-description="Create a ProductFacilityLocation">
 
-        <make-value value-name="newEntity" entity-name="ProductFacilityLocation"/>
+        <make-value value-field="newEntity" entity-name="ProductFacilityLocation"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateProductFacilityLocation" short-description="Update a ProductFacilityLocation">
 
-        <make-value entity-name="ProductFacilityLocation" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -565,7 +565,7 @@
     </simple-method>
     <simple-method method-name="deleteProductFacilityLocation" short-description="Delete a ProductFacilityLocation">
 
-        <make-value entity-name="ProductFacilityLocation" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -615,7 +615,7 @@
         
         <set field="parameters.availableToPromiseTotal" value="0" type="Double"/>
         <set field="parameters.quantityOnHandTotal" value="0" type="Double"/>
-        <iterate entry="inventoryItem" list-name="inventoryItems">
+        <iterate entry="inventoryItem" list="inventoryItems">
             <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
                 <if>
                     <condition>
@@ -731,7 +731,7 @@
 
         <!--  find their current reservations -->
         <set field="reserveQtyAccum" value="0" type="Double"/>
-        <iterate list-name="inventoryItems" entry-name="item">
+        <iterate list="inventoryItems" entry="item">
             <!-- If quantityOnHandTotal is not equal to availableToPromiseTotal this means that
                  there are pending reservations on the item that cause availableToPromiseTotal
                  to be lower than the quantityOnHandTotal (the opposite can never happen).
@@ -792,13 +792,13 @@
         </if-compare>
 
         <!-- FIRST, cancel all the reservations -->
-        <iterate list-name="allReservations" entry-name="oisgir">
+        <iterate list="allReservations" entry="oisgir">
             <set-service-fields service-name="cancelOrderItemShipGrpInvRes" to-map-name="cancelOisgirMap" map-name="oisgir"/>
             <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOisgirMap"/>
         </iterate>
 
         <!-- THEN, re-reserve the cancelled items -->
-        <iterate list-name="allReservations" entry-name="oisgir">
+        <iterate list="allReservations" entry="oisgir">
             <!-- maintain a Set (in a Map) of orderIds that we have reallocated for, but only if they had some quantityNotReserved -->
             <if-not-empty field="oisgir.quantityNotAvailable">
                 <if-compare field="oisgir.quantityNotAvailable" operator="greater" value="0" type="Double">
@@ -859,7 +859,7 @@
             <order-by field-name="sequenceId"/>
         </entity-condition>
 
-        <iterate list-name="relatedRes" entry-name="oneRelatedRes">
+        <iterate list="relatedRes" entry="oneRelatedRes">
             <entity-condition entity-name="PicklistAndBinAndItem" list-name="picklistItemList">
                 <condition-list combine="and">
                     <condition-expr field-name="orderId" env-name="oneRelatedRes.orderId"/>
@@ -897,7 +897,7 @@
         <list-to-list list-name="reservations" to-list-name="allReservations"/>
 
         <!-- FIRST, cancel all the reservations -->
-        <iterate list-name="allReservations" entry-name="oisgir">
+        <iterate list="allReservations" entry="oisgir">
             <clear-field field-name="cancelOisgirMap"/>
             <set field="cancelOisgirMap.orderId" from-field="oisgir.orderId"/>
             <set field="cancelOisgirMap.orderItemSeqId" from-field="oisgir.orderItemSeqId"/>
@@ -907,7 +907,7 @@
         </iterate>
 
         <!-- THEN, re-reserve the cancelled items -->
-        <iterate list-name="allReservations" entry-name="oisgir">
+        <iterate list="allReservations" entry="oisgir">
             <!-- maintain a Set (in a Map) of orderIds that we have reallocated for, but only if they had some quantityNotReserved -->
             <if-not-empty field="oisgir.quantityNotAvailable">
                 <if-compare field="oisgir.quantityNotAvailable" operator="greater" value="0" type="Double">
@@ -961,7 +961,7 @@
                     <condition-expr field-name="quantityNotAvailable" operator="not-equals" env-name="nullField"/>
                 </condition-list>
             </entity-condition>
-            <iterate list-name="oisgirais" entry-name="oisgir">
+            <iterate list="oisgirais" entry="oisgir">
                 <set field="orderItems.${oisgir.orderItemSeqId}" from-field="oisgir"/>
             </iterate>
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -985,7 +985,7 @@
     <!-- Inventory Transfer Services -->
     <simple-method method-name="createInventoryTransfer" short-description="Create an Inventory Transfer">
 
-        <make-value value-name="newEntity" entity-name="InventoryTransfer"/>
+        <make-value value-field="newEntity" entity-name="InventoryTransfer"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <sequenced-id-to-env sequence-name="InventoryTransfer" env-name="newEntity.inventoryTransferId"/>
         <field-to-result field-name="newEntity.inventoryTransferId" result-name="inventoryTransferId"/>
@@ -1067,7 +1067,7 @@
 
                 <!-- first transfer InventoryItems in FLT_PICKLOC type locations, then FLT_BULK locations, then InventoryItems with no locations -->
                 <find-by-and entity-name="InventoryItemAndLocation" map-name="lookupFieldMap" list-name="inventoryItemAndLocations" use-iterator="true" order-by-list-name="orderByList"/>
-                <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations">
+                <iterate entry="inventoryItemAndLocation" list="inventoryItemAndLocations">
                     <if>
                         <condition>
                             <and>
@@ -1105,7 +1105,7 @@
                 <!-- still some left? try the FLT_BULK locations -->
                 <if-compare field="quantityNotTransferred" operator="greater" value="0" type="Double">
                     <find-by-and entity-name="InventoryItemAndLocation" map-name="lookupFieldMap" list-name="inventoryItemAndLocations" use-iterator="true" order-by-list-name="orderByList"/>
-                    <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations">
+                    <iterate entry="inventoryItemAndLocation" list="inventoryItemAndLocations">
                         <if>
                             <condition>
                                 <and>
@@ -1144,7 +1144,7 @@
                 <!-- last of all transfer InventoryItems that have no locationSeqId, ie are not in any particular location -->
                 <if-compare field="quantityNotTransferred" operator="greater" value="0" type="Double">
                     <find-by-and entity-name="InventoryItem" map-name="lookupFieldMap" list-name="inventoryItems" use-iterator="true" order-by-list-name="orderByList"/>
-                    <iterate entry="inventoryItem" list-name="inventoryItems">
+                    <iterate entry="inventoryItem" list="inventoryItems">
                         <if>
                             <condition>
                                 <and>
@@ -1187,7 +1187,7 @@
     
     <!-- Inventory Label Services -->
     <simple-method method-name="createInventoryItemLabelType" short-description="Create an InventoryItemLabelType">
-        <make-value entity-name="InventoryItemLabelType" value-name="newEntity"/>
+        <make-value entity-name="InventoryItemLabelType" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -1202,7 +1202,7 @@
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="createInventoryItemLabel" short-description="Create an InventoryItemLabel">
-        <make-value entity-name="InventoryItemLabel" value-name="newEntity"/>
+        <make-value entity-name="InventoryItemLabel" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -1217,7 +1217,7 @@
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="createInventoryItemLabelAppl" short-description="Create an InventoryItemLabelAppl">
-        <make-value entity-name="InventoryItemLabelAppl" value-name="newEntity"/>
+        <make-value entity-name="InventoryItemLabelAppl" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 03:28:24 2008
@@ -53,7 +53,7 @@
              - orderItemShipGrpInvResInfoList (to be done later if we need it)
         -->
         <!-- start by making a Map where the locationSeqId is the key and the value is a List of orderItemShipGrpInvResAndItemLocation -->
-        <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList">
+        <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
             <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByLocMap.${orderItemShipGrpInvResAndItemLocation.locationSeqId}"/>
         </iterate>
 
@@ -61,7 +61,7 @@
         <iterate-map key-name="locationSeqId" value-name="perLocationOiirailList" map-name="oiirailByLocMap">
             <!-- now for more fun, split up by productId; this should generally not happen, but we'll make sure here -->
             <clear-field field-name="oiirailByProdMap"/>
-            <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="perLocationOiirailList">
+            <iterate entry="orderItemShipGrpInvResAndItemLocation" list="perLocationOiirailList">
                 <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByProdMap[orderItemShipGrpInvResAndItemLocation.productId]"/>
             </iterate>
 
@@ -94,7 +94,7 @@
 
                     <!-- get totalQuantity: iterate through perProductOiirailList and add up quantity (from OrderItemShipGrpInvRes) -->
                     <calculate field-name="moveInfo.totalQuantity" type="Double"><number value="0"/></calculate>
-                    <iterate entry="perProductOiirail" list-name="perProductOiirailList">
+                    <iterate entry="perProductOiirail" list="perProductOiirailList">
                         <calculate field-name="moveInfo.totalQuantity" type="Double">
                             <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field-name="perProductOiirail.quantity" operator="get"/></calcop>
                         </calculate>
@@ -109,7 +109,7 @@
 
                     <calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate>
                     <calculate field-name="totalAvailableToPromise" type="Double"><number value="0"/></calculate>
-                    <iterate entry="inventoryItem" list-name="inventoryItemList">
+                    <iterate entry="inventoryItem" list="inventoryItemList">
                         <calculate field-name="totalQuantityOnHand" type="Double">
                             <calcop field-name="totalQuantityOnHand" operator="add"><calcop field-name="inventoryItem.quantityOnHandTotal" operator="get"/></calcop>
                         </calculate>
@@ -130,7 +130,7 @@
                         <get-related value-name="moveInfo.targetProductFacilityLocation" relation-name="InventoryItem" list-name="targetInventoryItemList"/>
                         <calculate field-name="targetTotalAvailableToPromise" type="Double"><number value="0"/></calculate>
                         <calculate field-name="targetTotalQuantityOnHand" type="Double"><number value="0"/></calculate>
-                        <iterate entry="inventoryItem" list-name="targetInventoryItemList">
+                        <iterate entry="inventoryItem" list="targetInventoryItemList">
                             <calculate field-name="targetTotalAvailableToPromise" type="Double">
                                 <calcop field-name="targetTotalAvailableToPromise" operator="add"><calcop field-name="inventoryItem.availableToPromiseTotal" operator="get"/></calcop>
                             </calculate>
@@ -221,7 +221,7 @@
             <order-by field-name="productId"/>
         </entity-and>
         
-        <iterate entry="productFacilityLocationQuantityTest" list-name="productFacilityLocationQuantityTestList">
+        <iterate entry="productFacilityLocationQuantityTest" list="productFacilityLocationQuantityTestList">
             <!-- TODO: this comparison could be done by the database and be more efficient, but since we don't have field to field comparisons in the entity engine or EntityCondition operations in simple-methods, some work needs to be done before that can happen -->
             <if>
                 <condition>
@@ -269,7 +269,7 @@
                                 <set from-field="productFacilityLocationQuantityTest.moveQuantity" field="targetLocationMoveQuantity"/>
                                 <!-- start by making a Map where the locationSeqId is the key and the value is a List of InventoryItemAndLocation -->
                                 <clear-field field-name="InventoryItemAndLocationByLocMap"/>
-                                <iterate entry="InventoryItemAndLocation" list-name="inventoryItemAndLocationList">
+                                <iterate entry="InventoryItemAndLocation" list="inventoryItemAndLocationList">
                                     <field-to-list field-name="InventoryItemAndLocation" list-name="InventoryItemAndLocationByLocMap.${InventoryItemAndLocation.locationSeqId}"/>
                                 </iterate>
                                 <clear-field field-name="locationSeqId"/>
@@ -278,7 +278,7 @@
                                     <if-empty field="fromLocationTotalAvailableToPromise.${locationSeqId}">
                                         <calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate>
                                         <calculate field-name="totalAvailableToPromise" type="Double"><number value="0"/></calculate>
-                                        <iterate entry="inventoryItem" list-name="perLocationInventoryItemAndLocList">
+                                        <iterate entry="inventoryItem" list="perLocationInventoryItemAndLocList">
                                             <calculate field-name="totalQuantityOnHand" type="Double">
                                                 <calcop field-name="totalQuantityOnHand" operator="add"><calcop field-name="inventoryItem.quantityOnHandTotal" operator="get"/></calcop>
                                             </calculate>
@@ -376,7 +376,7 @@
                 <order-by field-name="datetimeReceived"/>
             </entity-and>
 
-            <iterate entry="inventoryItem" list-name="inventoryItemList">
+            <iterate entry="inventoryItem" list="inventoryItemList">
                 <!-- for each inventoryItem only process if quantityLeftToProcess > 0 and inventoryItem.availableToPromiseTotal > 0 -->
                 <if-compare field="quantityLeftToProcess" operator="greater" value="0" type="Double">
                     <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double">
@@ -389,7 +389,7 @@
                         </if-compare-field>
 
                         <!-- create a new InventoryItem for the targetInventoryItem -->
-                        <make-value entity-name="InventoryItem" map-name="inventoryItem" value-name="targetInventoryItem"/>
+                        <make-value entity-name="InventoryItem" map-name="inventoryItem" value-field="targetInventoryItem"/>
                         <set from-field="parameters.targetLocationSeqId" field="targetInventoryItem.locationSeqId"/>
                         <!-- now that targetInventoryItem is populated with quantities, etc, call createInventoryItem service -->
                         <clear-field field-name="createNonOisgirTargetDetailMap"/>
@@ -440,7 +440,7 @@
 
         <clear-field field-name="oiirailByInvItemMap"/>
         <log level="info" message="In processOisgirMoveByStatusInline orderItemShipGrpInvResAndItemLocationList=${orderItemShipGrpInvResAndItemLocationList}"/>
-        <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList">
+        <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
             <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByInvItemMap.${orderItemShipGrpInvResAndItemLocation.inventoryItemId}"/>
         </iterate>
 
@@ -459,7 +459,7 @@
             -->
             <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM">
                 <!-- create a new InventoryItem for the targetInventoryItem -->
-                <make-value entity-name="InventoryItem" map-name="inventoryItem" value-name="targetInventoryItem"/>
+                <make-value entity-name="InventoryItem" map-name="inventoryItem" value-field="targetInventoryItem"/>
                 <set from-field="parameters.targetLocationSeqId" field="targetInventoryItem.locationSeqId"/>
                 <!-- now that targetInventoryItem is populated with initial values, call createInventoryItem service -->
                 <set-service-fields map-name="targetInventoryItem" service-name="createInventoryItem" to-map-name="createInventoryItemMap"/>
@@ -479,7 +479,7 @@
                     sure to stay within quantityOnHand
                 -->
                 <set from-field="inventoryItem.quantityOnHandTotal" field="remainingQuantityOnHand"/>
-                <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList">
+                <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
                     <get-related-one value-name="orderItemShipGrpInvResAndItemLocation" relation-name="OrderItemShipGrpInvRes" to-value-name="orderItemShipGrpInvRes"/>
                     
                     <!-- see if there is enough physically moved over to move this reservation -->
@@ -532,7 +532,7 @@
                     </if>
 
                     <!-- make a new OISGIR value object -->
-                    <make-value entity-name="OrderItemShipGrpInvRes" map-name="orderItemShipGrpInvRes" value-name="targetOrderItemShipGrpInvRes"/>
+                    <make-value entity-name="OrderItemShipGrpInvRes" map-name="orderItemShipGrpInvRes" value-field="targetOrderItemShipGrpInvRes"/>
                     <set from-field="targetInventoryItem.inventoryItemId" field="targetOrderItemShipGrpInvRes.inventoryItemId"/>
 
                     <!-- okay, move it over, start by calculating new QOHs; note that don't need to modify the ATP since with an OISGIR that has already been subtracted out, so it shouldn't be subtracted from the source or added to the target -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml Tue Dec 30 03:28:24 2008
@@ -27,7 +27,7 @@
             <add-error><fail-message message="Product with id [${productId}] doesn't exist."/></add-error>
         </if-empty>
         <check-errors/>
-        <make-value value-name="productDimension" entity-name="ProductDimension"/>
+        <make-value value-field="productDimension" entity-name="ProductDimension"/>
         <set-nonpk-fields map-name="product" value-name="productDimension"/>
 
         <get-related-one value-name="product" relation-name="ProductType" to-value-name="productType"/>
@@ -49,7 +49,7 @@
     </simple-method>
     <simple-method method-name="loadAllProductsInProductDimension" short-description="">
         <entity-condition entity-name="Product" list-name="products"/>
-        <iterate list-name="products" entry-name="product">
+        <iterate list="products" entry="product">
             <set-service-fields service-name="loadProductInProductDimension" map-name="parameters" to-map-name="inMap"/>
             <set field="inMap.productId" from-field="product.productId"/>
             <call-service service-name="loadProductInProductDimension" in-map-name="inMap"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Dec 30 03:28:24 2008
@@ -28,7 +28,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductPrice"/>
+        <make-value value-field="newEntity" entity-name="ProductPrice"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -73,7 +73,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductPrice" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductPrice" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPrice" map-name="lookupPKMap" value-name="lookedUpValue"/>
 
@@ -95,7 +95,7 @@
         <check-errors/>
 
         <!-- Note that this is kept pretty simple: if a price is specific but no oldPrice, then it is generally a create, if both are specified it is generally an update, if only the oldPrice is specified it is generally a delete -->
-        <make-value value-name="newEntity" entity-name="ProductPriceChange"/>
+        <make-value value-field="newEntity" entity-name="ProductPriceChange"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <sequenced-id-to-env sequence-name="ProductPriceChange" env-name="productPriceChangeId"/>
@@ -113,7 +113,7 @@
         <set field="checkAction" value="CREATE" />
         <call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
         <check-errors/>
-        <make-value entity-name="ProductPaymentMethodType" value-name="newEntity"/>
+        <make-value entity-name="ProductPaymentMethodType" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -143,7 +143,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductPriceRule"/>
+        <make-value value-field="newEntity" entity-name="ProductPriceRule"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <sequenced-id-to-env sequence-name="ProductPriceRule" env-name="newEntity.productPriceRuleId"/>
         <field-to-result field-name="productPriceRuleId" map-name="newEntity"/>
@@ -155,7 +155,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductPriceRule" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceRule" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -166,7 +166,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductPriceRule" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceRule" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -178,7 +178,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductPriceCond"/>
+        <make-value value-field="newEntity" entity-name="ProductPriceCond"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
@@ -191,7 +191,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductPriceCond" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceCond" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -202,7 +202,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductPriceCond" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceCond" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -214,7 +214,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductPriceAction"/>
+        <make-value value-field="newEntity" entity-name="ProductPriceAction"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
@@ -227,7 +227,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductPriceAction" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceAction" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -238,7 +238,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductPriceAction" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceAction" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Tue Dec 30 03:28:24 2008
@@ -23,7 +23,7 @@
     <simple-method method-name="createCustomerDigitalDownloadProduct" short-description="createCustomerDigitalDownloadProduct">
         <now-timestamp-to-env env-name="nowTimestamp"/>
 
-        <make-value value-name="createProductMap" entity-name="Product"/>
+        <make-value value-field="createProductMap" entity-name="Product"/>
         <sequenced-id-to-env sequence-name="Product" env-name="createProductMap.productId"/>
         <set field="productId" from-field="createProductMap.productId"/>
 
@@ -33,7 +33,7 @@
         <set field="createProductMap.productTypeId" value="DIGITAL_GOOD"/>
         <create-value value-name="createProductMap"/>
 
-        <make-value value-name="createProductPriceMap" entity-name="ProductPrice"/>
+        <make-value value-field="createProductPriceMap" entity-name="ProductPrice"/>
         <set field="createProductPriceMap.productId" from-field="productId"/>
         <set field="createProductPriceMap.productPriceTypeId" value="DEFAULT_PRICE"/>
         <set field="createProductPriceMap.productPricePurposeId" value="PURCHASE"/>
@@ -43,7 +43,7 @@
         <set field="createProductPriceMap.price" from-field="parameters.price"/>
         <create-value value-name="createProductPriceMap"/>
         
-        <make-value value-name="createProductSupplierMap" entity-name="SupplierProduct"/>
+        <make-value value-field="createProductSupplierMap" entity-name="SupplierProduct"/>
         <set field="createProductSupplierMap.productId" from-field="productId"/>
         <set field="createProductSupplierMap.partyId" from-field="userLogin.partyId"/>
         <set field="createProductSupplierMap.currencyUomId" from-field="parameters.currencyUomId" default-value="USD"/>
@@ -59,7 +59,7 @@
         <!-- create association with ProductStore.digProdUploadCategoryId -->
         <entity-one entity-name="ProductStore" value-name="productStore"/>
         <if-not-empty field="productStore.digProdUploadCategoryId">
-            <make-value value-name="addProductToCategoryMap" entity-name="ProductCategoryMember"/>
+            <make-value value-field="addProductToCategoryMap" entity-name="ProductCategoryMember"/>
             <set field="addProductToCategoryMap.productId" from-field="productId"/>
             <set field="addProductToCategoryMap.productCategoryId" from-field="productStore.digProdUploadCategoryId"/>
             <create-value value-name="addProductToCategoryMap"/>
@@ -122,7 +122,7 @@
         <check-errors/>
         
         <!-- keep the product around, just expire SupplierProduct and ProductCategoryMember records -->
-        <iterate entry="supplierProduct" list-name="supplierProductList">
+        <iterate entry="supplierProduct" list="supplierProductList">
             <set field="supplierProduct.availableThruDate" from-field="nowTimestamp"/>
             <store-value value-name="supplierProduct"/>
         </iterate>
@@ -130,7 +130,7 @@
         <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMemberList">
             <field-map field-name="productId"/>
         </entity-and>
-        <iterate entry="productCategoryMember" list-name="productCategoryMemberList">
+        <iterate entry="productCategoryMember" list="productCategoryMemberList">
             <set field="productCategoryMember.thruDate" from-field="nowTimestamp"/>
             <store-value value-name="productCategoryMember"/>
         </iterate>
@@ -160,7 +160,7 @@
         
         <check-errors/>
         
-        <make-value value-name="productContent" entity-name="ProductContent"/>
+        <make-value value-field="productContent" entity-name="ProductContent"/>
         <set field="productContent.productId" from-field="parameters.productId"/>
         <set field="productContent.contentId" from-field="parameters.contentId"/>
         <set field="productContent.productContentTypeId" value="DIGITAL_DOWNLOAD"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <!-- ProductContent -->
     <simple-method method-name="createProductContent" short-description="Create Content For Product">
-        <make-value value-name="newEntity" entity-name="ProductContent"/>
+        <make-value value-field="newEntity" entity-name="ProductContent"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -41,7 +41,7 @@
         <field-to-result map-name="newEntity" field-name="productContentTypeId"/>
     </simple-method>
     <simple-method method-name="updateProductContent" short-description="Update Content For Product">
-        <make-value value-name="lookupPKMap" entity-name="ProductContent"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -51,7 +51,7 @@
         <call-service service-name="updateContent" in-map-name="updateContent"/>
     </simple-method>
     <simple-method method-name="removeProductContent" short-description="Remove Content From Product">
-        <make-value value-name="lookupPKMap" entity-name="ProductContent"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -116,12 +116,12 @@
 
     <!-- ProductFeatureDataResource -->
     <simple-method method-name="createProductFeatureDataResource" short-description="Create ProductFeature-DataResource">
-        <make-value value-name="newEntity" entity-name="ProductFeatureDataResource"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureDataResource"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="removeProductFeatureDataResource" short-description="Remove ProductFeature-DataResource">
-        <make-value value-name="lookupPKMap" entity-name="ProductFeatureDataResource"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductFeatureDataResource"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 03:28:24 2008
@@ -27,7 +27,7 @@
         </check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="Product"/>
+        <make-value value-field="newEntity" entity-name="Product"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <set from-field="parameters.productId" field="newEntity.productId"/>
@@ -60,7 +60,7 @@
         <!-- if setting the primaryProductCategoryId create a member entity too -->
         <!-- THIS IS REMOVED BECAUSE IT CAUSES PROBLEMS FOR WORKING ON PRODUCTION SITES
         <if-not-empty field="newEntity.primaryProductCategoryId">
-            <make-value entity-name="ProductCategoryMember" value-name="newMember"/>
+            <make-value entity-name="ProductCategoryMember" value-field="newMember"/>
             <set from-field="productId" map-name="newEntity" to-field-name="productId" to-map-name="newMember"/>
             <set from-field="primaryProductCategoryId" map-name="newEntity" to-field-name="productCategoryId" to-map-name="newMember"/>
             <now-timestamp-to-env env-name="nowStamp"/>
@@ -76,9 +76,9 @@
                 <field-map field-name="roleTypeId" value="LTD_ADMIN"/>
             </entity-and>
             
-            <iterate entry="productCategoryRole" list-name="productCategoryRoles">
+            <iterate entry="productCategoryRole" list="productCategoryRoles">
                 <!-- add this new product to the category -->
-                <make-value value-name="newLimitMember" entity-name="ProductCategoryMember"/>
+                <make-value value-field="newLimitMember" entity-name="ProductCategoryMember"/>
                 <set from-field="newEntity.productId" field="newLimitMember.productId"/>
                 <set from-field="productCategoryRole.productCategoryId" field="newLimitMember.productCategoryId"/>
                 <set from-field="nowTimestamp" field="newLimitMember.fromDate"/>
@@ -106,7 +106,7 @@
         <!-- THIS IS REMOVED BECAUSE IT CAUSES PROBLEMS FOR WORKING ON PRODUCTION SITES
         <if-not-empty field="lookedUpValue.primaryProductCategoryId">
             <if-compare-field to-field="saveIdMap.primaryProductCategoryId" field="lookedUpValue.primaryProductCategoryId" operator="equals">
-                <make-value entity-name="ProductCategoryMember" value-name="newMember"/>
+                <make-value entity-name="ProductCategoryMember" value-field="newMember"/>
                 <set from-field="productId" map-name="newEntity" to-field-name="productId" to-map-name="newMember"/>
                 <set from-field="primaryProductCategoryId" map-name="newEntity" to-field-name="productCategoryId" to-map-name="newMember"/>
                 <now-timestamp-to-env env-name="newMember.fromDate"/>
@@ -142,7 +142,7 @@
             <!-- get all productAssocs, then get the actual product to update -->
             <find-by-and entity-name="ProductAssoc" map-name="variantProductAssocMap" list-name="variantProductAssocs"/>
             <filter-list-by-date list-name="variantProductAssocs"/>
-            <iterate entry="variantProductAssoc" list-name="variantProductAssocs">
+            <iterate entry="variantProductAssoc" list="variantProductAssocs">
                 <clear-field field-name="variantProduct"/>
                 <entity-one entity-name="Product" value-name="variantProduct" auto-field-map="false">
                     <field-map field-name="productId" from-field="variantProductAssoc.productIdTo"/>
@@ -202,7 +202,7 @@
         <!-- if requested, duplicate related data as well -->
         <if-not-empty field="parameters.duplicatePrices">
             <find-by-and entity-name="ProductPrice" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productId"/>
                 <create-value value-name="newTempValue"/>
@@ -210,7 +210,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateIDs">
             <find-by-and entity-name="GoodIdentification" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productId"/>
                 <create-value value-name="newTempValue"/>
@@ -218,7 +218,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateContent">
             <find-by-and entity-name="ProductContent" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productId"/>
                 <create-value value-name="newTempValue"/>
@@ -226,7 +226,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateCategoryMembers">
             <find-by-and entity-name="ProductCategoryMember" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productId"/>
                 <create-value value-name="newTempValue"/>
@@ -234,7 +234,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateAssocs">
             <find-by-and entity-name="ProductAssoc" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productId"/>
                 <create-value value-name="newTempValue"/>
@@ -244,7 +244,7 @@
             <entity-and entity-name="ProductAssoc" list-name="foundValues">
                 <field-map field-name="productIdTo" from-field="parameters.oldProductId"/>
             </entity-and>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productIdTo"/>
                 <create-value value-name="newTempValue"/>
@@ -252,7 +252,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateAttributes">
             <find-by-and entity-name="ProductAttribute" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productId"/>
                 <create-value value-name="newTempValue"/>
@@ -260,7 +260,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateFeatureAppls">
             <find-by-and entity-name="ProductFeatureAppl" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.productId" field="newTempValue.productId"/>
                 <create-value value-name="newTempValue"/>
@@ -268,7 +268,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateInventoryItems">
             <find-by-and entity-name="InventoryItem" map-name="productFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <!--
                     NOTE: new inventory items should always be created calling the
                           createInventoryItem service because in this way we are sure
@@ -317,7 +317,7 @@
     
     <!-- Product Keyword Services -->
     <simple-method method-name="createProductKeyword" short-description="create a ProductKeyword">
-        <make-value entity-name="ProductKeyword" value-name="newEntity"/>
+        <make-value entity-name="ProductKeyword" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -376,7 +376,7 @@
         <store-value value-name="product"/>
         <!-- expire product from all categories -->
         <get-related value-name="product" relation-name="ProductCategoryMember" list-name="productCategoryMembers"/>
-        <iterate entry="productCategoryMember" list-name="productCategoryMembers">
+        <iterate entry="productCategoryMember" list="productCategoryMembers">
             <if-empty field="productCategoryMember.thruDate">
                 <set from-field="nowTimestamp" field="productCategoryMember.thruDate"/>
                 <store-value value-name="productCategoryMember"/>
@@ -384,7 +384,7 @@
         </iterate>
         <!-- expire product from all associations going to it -->
         <get-related value-name="product" relation-name="AssocProductAssoc" list-name="assocProductAssocs"/>
-        <iterate entry="assocProductAssoc" list-name="assocProductAssocs">
+        <iterate entry="assocProductAssoc" list="assocProductAssocs">
             <if-empty field="assocProductAssoc.thruDate">
                 <set from-field="nowTimestamp" field="assocProductAssoc.thruDate"/>
                 <store-value value-name="assocProductAssoc"/>
@@ -399,7 +399,7 @@
         <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/>
         <if-empty field="productCalculatedInfo">
             <!-- go ahead and create it -->
-            <make-value value-name="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
+            <make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
             <set from-field="parameters.productId" field="productCalculatedInfo.productId"/>
             <set from-field="parameters.weight" field="productCalculatedInfo.totalTimesViewed"/>
             <create-value value-name="productCalculatedInfo"/>
@@ -431,7 +431,7 @@
         <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/>
         <if-empty field="productCalculatedInfo">
             <!-- go ahead and create it -->
-            <make-value value-name="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
+            <make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
             <set from-field="parameters.productId" field="productCalculatedInfo.productId"/>
             <set from-field="parameters.quantity" field="productCalculatedInfo.totalQuantityOrdered"/>
             <create-value value-name="productCalculatedInfo"/>
@@ -460,7 +460,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="GoodIdentification"/>
+        <make-value value-field="newEntity" entity-name="GoodIdentification"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -471,7 +471,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value entity-name="GoodIdentification" value-name="lookupPKMap"/>
+        <make-value entity-name="GoodIdentification" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -483,7 +483,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value entity-name="GoodIdentification" value-name="lookupPKMap"/>
+        <make-value entity-name="GoodIdentification" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -496,7 +496,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductGlAccount"/>
+        <make-value value-field="newEntity" entity-name="ProductGlAccount"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -507,7 +507,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value entity-name="ProductGlAccount" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductGlAccount" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductGlAccount" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -519,14 +519,14 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value entity-name="ProductGlAccount" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductGlAccount" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductGlAccount" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
     <simple-method method-name="createProductReview" short-description="Create a ProductReview">
-        <make-value value-name="newEntity" entity-name="ProductReview"/>
+        <make-value value-field="newEntity" entity-name="ProductReview"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set from-field="userLogin.userLoginId" field="newEntity.userLoginId"/>
         <set value="PRR_PENDING" field="newEntity.statusId"/>
@@ -565,7 +565,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
         
-        <make-value value-name="lookupPKMap" entity-name="ProductReview"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductReview"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -588,7 +588,7 @@
         <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/>
         <if-empty field="productCalculatedInfo">
             <!-- go ahead and create it -->
-            <make-value value-name="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
+            <make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/>
             <set from-field="parameters.productId" field="productCalculatedInfo.productId"/>
             <set from-field="averageCustomerRating" field="productCalculatedInfo.averageCustomerRating"/>
             <create-value value-name="productCalculatedInfo"/>
@@ -613,18 +613,18 @@
         <set value="PRODUCT_VARIANT" field="variantsFindContext.productAssocTypeId"/>
         <find-by-and entity-name="ProductAssoc" map-name="variantsFindContext" list-name="variants"/>
         <filter-list-by-date list-name="variants"/>
-        <iterate entry="newProduct" list-name="variants">
+        <iterate entry="newProduct" list="variants">
             <set from-field="newProduct.productIdTo" field="productVariantContext.productId"/>
             <!-- if requested, duplicate related data -->
             <if-not-empty field="parameters.duplicatePrices">
                 <if-not-empty field="parameters.removeBefore">
                     <find-by-and entity-name="ProductPrice" map-name="productVariantContext" list-name="foundVariantValues"/>
-                    <iterate entry="foundVariantValue" list-name="foundVariantValues">
+                    <iterate entry="foundVariantValue" list="foundVariantValues">
                         <remove-value value-name="foundVariantValue"/>
                     </iterate>
                 </if-not-empty>
                 <find-by-and entity-name="ProductPrice" map-name="productFindContext" list-name="foundValues"/>
-                <iterate entry="foundValue" list-name="foundValues">
+                <iterate entry="foundValue" list="foundValues">
                     <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                     <set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
                     <create-value value-name="newTempValue"/>
@@ -633,12 +633,12 @@
             <if-not-empty field="parameters.duplicateIDs">
                 <if-not-empty field="parameters.removeBefore">
                     <find-by-and entity-name="GoodIdentification" map-name="productVariantContext" list-name="foundVariantValues"/>
-                    <iterate entry="foundVariantValue" list-name="foundVariantValues">
+                    <iterate entry="foundVariantValue" list="foundVariantValues">
                         <remove-value value-name="foundVariantValue"/>
                     </iterate>
                 </if-not-empty>
                 <find-by-and entity-name="GoodIdentification" map-name="productFindContext" list-name="foundValues"/>
-                <iterate entry="foundValue" list-name="foundValues">
+                <iterate entry="foundValue" list="foundValues">
                     <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                     <set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
                     <create-value value-name="newTempValue"/>
@@ -647,12 +647,12 @@
             <if-not-empty field="parameters.duplicateContent">
                 <if-not-empty field="parameters.removeBefore">
                     <find-by-and entity-name="ProductContent" map-name="productVariantContext" list-name="foundVariantValues"/>
-                    <iterate entry="foundVariantValue" list-name="foundVariantValues">
+                    <iterate entry="foundVariantValue" list="foundVariantValues">
                         <remove-value value-name="foundVariantValue"/>
                     </iterate>
                 </if-not-empty>
                 <find-by-and entity-name="ProductContent" map-name="productFindContext" list-name="foundValues"/>
-                <iterate entry="foundValue" list-name="foundValues">
+                <iterate entry="foundValue" list="foundValues">
                     <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                     <set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
                     <create-value value-name="newTempValue"/>
@@ -661,12 +661,12 @@
             <if-not-empty field="parameters.duplicateCategoryMembers">
                 <if-not-empty field="parameters.removeBefore">
                     <find-by-and entity-name="ProductCategoryMember" map-name="productVariantContext" list-name="foundVariantValues"/>
-                    <iterate entry="foundVariantValue" list-name="foundVariantValues">
+                    <iterate entry="foundVariantValue" list="foundVariantValues">
                         <remove-value value-name="foundVariantValue"/>
                     </iterate>
                 </if-not-empty>
                 <find-by-and entity-name="ProductCategoryMember" map-name="productFindContext" list-name="foundValues"/>
-                <iterate entry="foundValue" list-name="foundValues">
+                <iterate entry="foundValue" list="foundValues">
                     <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                     <set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
                     <create-value value-name="newTempValue"/>
@@ -675,12 +675,12 @@
             <if-not-empty field="parameters.duplicateAttributes">
                 <if-not-empty field="parameters.removeBefore">
                     <find-by-and entity-name="ProductAttribute" map-name="productVariantContext" list-name="foundVariantValues"/>
-                    <iterate entry="foundVariantValue" list-name="foundVariantValues">
+                    <iterate entry="foundVariantValue" list="foundVariantValues">
                         <remove-value value-name="foundVariantValue"/>
                     </iterate>
                 </if-not-empty>
                 <find-by-and entity-name="ProductAttribute" map-name="productFindContext" list-name="foundValues"/>
-                <iterate entry="foundValue" list-name="foundValues">
+                <iterate entry="foundValue" list="foundValues">
                     <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                     <set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
                     <create-value value-name="newTempValue"/>
@@ -689,12 +689,12 @@
             <if-not-empty field="parameters.duplicateFacilities">
                 <if-not-empty field="parameters.removeBefore">
                     <find-by-and entity-name="ProductFacility" map-name="productVariantContext" list-name="foundVariantValues"/>
-                    <iterate entry="foundVariantValue" list-name="foundVariantValues">
+                    <iterate entry="foundVariantValue" list="foundVariantValues">
                         <remove-value value-name="foundVariantValue"/>
                     </iterate>
                 </if-not-empty>
                 <find-by-and entity-name="ProductFacility" map-name="productFindContext" list-name="foundValues"/>
-                <iterate entry="foundValue" list-name="foundValues">
+                <iterate entry="foundValue" list="foundValues">
                     <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                     <set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
                     <create-value value-name="newTempValue"/>
@@ -703,12 +703,12 @@
             <if-not-empty field="parameters.duplicateLocations">
                 <if-not-empty field="parameters.removeBefore">
                     <find-by-and entity-name="ProductFacilityLocation" map-name="productVariantContext" list-name="foundVariantValues"/>
-                    <iterate entry="foundVariantValue" list-name="foundVariantValues">
+                    <iterate entry="foundVariantValue" list="foundVariantValues">
                         <remove-value value-name="foundVariantValue"/>
                     </iterate>
                 </if-not-empty>
                 <find-by-and entity-name="ProductFacilityLocation" map-name="productFindContext" list-name="foundValues"/>
-                <iterate list-name="foundValues" entry-name="foundValue">
+                <iterate list="foundValues" entry="foundValue">
                     <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                     <set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
                     <create-value value-name="newTempValue"/>
@@ -724,7 +724,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductAssoc"/>
+        <make-value value-field="newEntity" entity-name="ProductAssoc"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -736,7 +736,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
         
-        <make-value value-name="lookupPKMap" entity-name="ProductAssoc"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductAssoc"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductAssoc" map-name="lookupPKMap" value-name="productAssocInstance"/>
         <set-nonpk-fields map-name="parameters" value-name="productAssocInstance"/>
@@ -748,7 +748,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
         
-        <make-value value-name="lookupPKMap" entity-name="ProductAssoc"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductAssoc"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductAssoc" map-name="lookupPKMap" value-name="productAssocInstance"/>
         <remove-value value-name="productAssocInstance"/>
@@ -761,7 +761,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
         
-        <make-value value-name="newEntity" entity-name="ProductMaint"/>
+        <make-value value-field="newEntity" entity-name="ProductMaint"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productMaintSeqId"/> <!-- this finds the next sub-sequence ID -->
@@ -794,7 +794,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductMeter"/>
+        <make-value value-field="newEntity" entity-name="ProductMeter"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -821,7 +821,7 @@
 
     <!-- ProductGeo Services -->
     <simple-method method-name="createProductGeo" short-description="Create an Product Geo">
-        <make-value value-name="newEntity" entity-name="ProductGeo"/>
+        <make-value value-field="newEntity" entity-name="ProductGeo"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -906,7 +906,7 @@
     </simple-method>
     <!-- Product Attribute Services -->
     <simple-method method-name="createProductAttribute" short-description="create a ProductAttribute">
-        <make-value entity-name="ProductAttribute" value-name="newEntity"/>
+        <make-value entity-name="ProductAttribute" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -931,7 +931,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductRole"/>
+        <make-value value-field="newEntity" entity-name="ProductRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -947,7 +947,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductRole"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -959,20 +959,20 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductRole"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     
     <simple-method method-name="createVendorProduct" short-description="Create a VendorProduct">
-        <make-value entity-name="VendorProduct" value-name="newEntity"/>
+        <make-value entity-name="VendorProduct" value-field="newEntity"/>
         <set-pk-fields value-name="newEntity" map-name="parameters"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     
     <simple-method method-name="deleteVendorProduct" short-description="Remove the VendorProduct">
-        <make-value entity-name="VendorProduct" value-name="lookedUpValue"/>
+        <make-value entity-name="VendorProduct" value-field="lookedUpValue"/>
         <set-pk-fields value-name="lookedUpValue" map-name="parameters"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
@@ -984,7 +984,7 @@
         <call-simple-method method-name="checkProductRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductCategoryGlAccount"/>
+        <make-value value-field="newEntity" entity-name="ProductCategoryGlAccount"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>