svn commit: r730098 [5/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/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 03:28:24 2008
@@ -24,7 +24,7 @@
     <simple-method method-name="createPartyRole" short-description="Create Party Role">
         <entity-one entity-name="PartyRole" value-name="partyRole"/>
         <if-empty field="partyRole">
-            <make-value entity-name="PartyRole" value-name="newEntity"/>
+            <make-value entity-name="PartyRole" value-field="newEntity"/>
             <set-pk-fields map-name="parameters" value-name="newEntity"/>
             <create-value value-name="newEntity"/>  
         </if-empty>
@@ -41,7 +41,7 @@
             <set field="parameters.partyId" from-field="userLogin.partyId"/>
         </if-empty>
         
-        <make-value value-name="partyNameHistory" entity-name="PartyNameHistory"/>
+        <make-value value-field="partyNameHistory" entity-name="PartyNameHistory"/>
         <set-pk-fields value-name="partyNameHistory" map-name="parameters"/>
         <now-timestamp-to-env env-name="partyNameHistory.changeDate"/>
         
@@ -101,7 +101,7 @@
             <set field="parameters.compareDate" from-field="nowTimestamp"/>
         </if-empty>
         <!-- go through the list which is sorted by most recent first and find the oldest (last) one with the changeDate greater than the compareDate -->        
-        <iterate entry="partyNameHistory" list-name="partyNameHistoryList">
+        <iterate entry="partyNameHistory" list="partyNameHistoryList">
             <if-compare-field field="partyNameHistory.changeDate" to-field="parameters.compareDate" operator="greater">
                 <set field="partyNameHistoryCurrent" from-field="partyNameHistory"/>
             </if-compare-field>
@@ -174,7 +174,7 @@
     
     <!-- PostalAddressBoundary methods -->
     <simple-method method-name="createPostalAddressBoundary" short-description="Create Postal Address Boundary">
-        <make-value entity-name="PostalAddressBoundary" value-name="newEntity"/>
+        <make-value entity-name="PostalAddressBoundary" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -183,10 +183,10 @@
         <remove-value value-name="postalAddressBoundary"/>
     </simple-method>
     <simple-method method-name="getPostalAddressBoundary" short-description="Get Postal Address Boundary">
-        <make-value entity-name="PostalAddressBoundary" value-name="postalAddressBoundaryLookupMap"/>
+        <make-value entity-name="PostalAddressBoundary" value-field="postalAddressBoundaryLookupMap"/>
         <set field="postalAddressBoundaryLookupMap.geoId" from-field="parameters.geoId"/>
         <find-by-and entity-name="PostalAddressBoundary" map-name="postalAddressBoundaryLookupMap" list-name="postalAddressBoundaries"/>
-        <iterate list-name="postalAddressBoundaries" entry-name="postalAddressBoundary">
+        <iterate list="postalAddressBoundaries" entry="postalAddressBoundary">
             <get-related-one value-name="postalAddressBoundary" to-value-name="geo" relation-name="Geo"/>
             <field-to-list field-name="geo" list-name="geos"/>
         </iterate>
@@ -195,7 +195,7 @@
 
     <!-- PartyClassification methods -->
     <simple-method method-name="createPartyClassification" short-description="create a PartyClassification">
-        <make-value entity-name="PartyClassification" value-name="newEntity"/>
+        <make-value entity-name="PartyClassification" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>        
@@ -213,7 +213,7 @@
     <!-- PartyClassificationGroup methods -->
     <simple-method method-name="createPartyClassificationGroup" short-description="create a PartyClassificationGroup">
         <log level="verbose" message="in newEntity" />
-        <make-value entity-name="PartyClassificationGroup" value-name="newEntity"/>
+        <make-value entity-name="PartyClassificationGroup" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="PartyClassificationGroup" env-name="newEntity.partyClassificationGroupId"/>
         <field-to-result field-name="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -232,7 +232,7 @@
     
     <!-- Vendor Party services -->
     <simple-method method-name="createVendor" short-description="createVendor">
-        <make-value value-name="newEntity" entity-name="Vendor"/>
+        <make-value value-field="newEntity" entity-name="Vendor"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -249,7 +249,7 @@
 
     <!-- party attribute services -->
     <simple-method method-name="createPartyAttribute" short-description="createPartyAttribute">
-        <make-value value-name="newEntity" entity-name="PartyAttribute"/>
+        <make-value value-field="newEntity" entity-name="PartyAttribute"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -273,7 +273,7 @@
         <!-- lookup existing value -->
         <entity-one entity-name="PartyProfileDefault" value-name="partyProfileDefault"/>
         <if-empty field="partyProfileDefault">
-            <make-value value-name="partyProfileDefault" entity-name="PartyProfileDefault"/>
+            <make-value value-field="partyProfileDefault" entity-name="PartyProfileDefault"/>
             <set-pk-fields value-name="partyProfileDefault" map-name="parameters"/>
             <create-value value-name="partyProfileDefault"/>
         </if-empty>
@@ -345,7 +345,7 @@
             <set value="OWNER" field="contentRole.roleTypeId"/>
             <call-service service-name="createContentRole" in-map-name="contentRole" break-on-error="false" />
             <!-- check party role -->
-            <make-value value-name="partyRole" entity-name="PartyRole"/>
+            <make-value value-field="partyRole" entity-name="PartyRole"/>
             <set-pk-fields value-name="partyRole" map-name="contentRole"/>
             <find-by-and entity-name="PartyRole" map-name="partyRole" list-name="pRoles"/>
             <if-empty field="pRoles">
@@ -449,7 +449,7 @@
         <set from-field="parameters.partyRelationshipTypeId" field="lookupMap.partyRelationshipTypeId"/>
         
         <find-by-and entity-name="PartyRelationship" map-name="lookupMap" list-name="partyRelationships"/>
-        <iterate list-name="partyRelationships" entry-name="partyRelationship">
+        <iterate list="partyRelationships" entry="partyRelationship">
             <get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-name="party"/>
             <field-to-list field-name="party" list-name="parties"/>
         </iterate>
@@ -528,7 +528,7 @@
     <simple-method method-name="followPartyRelationshipsInlineRecurse" short-description="followPartyRelationshipsInlineRecurse">
         <clear-field field-name="_inline_NewRelatedPartyIdList"/>
         
-        <iterate entry="relatedPartyId" list-name="relatedPartyIdList">
+        <iterate entry="relatedPartyId" list="relatedPartyIdList">
             <if>
                 <condition><not><if-compare-field field="_inline_relatedPartyIdAlreadySearchedList" to-field="relatedPartyId" operator="contains"/></not></condition>
                 <then>
@@ -552,7 +552,7 @@
                         <!-- get the newest (highest date) first -->
                         <order-by field-name="-fromDate"/>
                     </entity-condition>
-                    <iterate entry="_inline_PartyRelationship" list-name="_inline_PartyRelationshipList">
+                    <iterate entry="_inline_PartyRelationship" list="_inline_PartyRelationshipList">
                         <if>
                             <condition>
                                 <and>
@@ -585,7 +585,7 @@
                             <!-- get the newest (highest date) first -->
                             <order-by field-name="-fromDate"/>
                         </entity-condition>
-                        <iterate entry="_inline_PartyRelationship" list-name="_inline_PartyRelationshipList">
+                        <iterate entry="_inline_PartyRelationship" list="_inline_PartyRelationshipList">
                             <if>
                                 <condition>
                                     <and>
@@ -622,7 +622,7 @@
     <simple-method method-name="getChildRoleTypesInline" short-description="getChildRoleTypes">
         <clear-field field-name="_inline_NewRoleTypeIdList"/>
         
-        <iterate entry="roleTypeId" list-name="${roleTypeIdListName}">
+        <iterate entry="roleTypeId" list="${roleTypeIdListName}">
             <if>
                 <condition><not><if-compare-field field="_inline_roleTypeIdAlreadySearchedList" to-field="roleTypeId" operator="contains"/></not></condition>
                 <then>
@@ -632,7 +632,7 @@
                     <entity-condition entity-name="RoleType" list-name="_inline_RoleTypeList" use-cache="true">
                         <condition-expr field-name="parentTypeId" operator="equals" env-name="roleTypeId"/>
                     </entity-condition>
-                    <iterate entry="newRoleType" list-name="_inline_RoleTypeList">
+                    <iterate entry="newRoleType" list="_inline_RoleTypeList">
                         <if>
                             <condition>
                                 <and>
@@ -692,8 +692,8 @@
         <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/>
         <filter-list-by-date list-name="telephoneAll2" to-list-name="telephoneAll3"/>
         <if-not-empty field="telephoneAll3">
-            <iterate entry="type" list-name="types">
-                <iterate entry="telephone" list-name="telephoneAll3">
+            <iterate entry="type" list="types">
+                <iterate entry="telephone" list="telephoneAll3">
                     <if-empty field="found">
                         <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals">
                             <set field="found" value="notImportant"/>
@@ -738,13 +738,13 @@
     <simple-method method-name="createAddressMatchMap" short-description="create a AddressMatchMap">
         <call-object-method obj-field-name="mapValue" obj-map-name="parameters" method-name="toUpperCase" ret-field-name="mapValue" ret-map-name="parameters"/>
         <call-object-method obj-field-name="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field-name="mapKey" ret-map-name="parameters"/>
-        <make-value entity-name="AddressMatchMap" value-name="newEntity"/>
+        <make-value entity-name="AddressMatchMap" 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"/>
     </simple-method>
     <simple-method method-name="deleteAddressMatchMap" short-description="remove a AddressMatchMap">
-        <make-value entity-name="AddressMatchMap" value-name="fieldMap"/>
+        <make-value entity-name="AddressMatchMap" value-field="fieldMap"/>
         <set-pk-fields map-name="parameters" value-name="fieldMap"/>
         <remove-value value-name="fieldMap"/>
     </simple-method>
@@ -752,7 +752,7 @@
         <entity-condition entity-name="AddressMatchMap" list-name="addrs">
             <use-iterator/>
         </entity-condition>
-        <iterate entry="addr" list-name="addrs">
+        <iterate entry="addr" list="addrs">
             <remove-value value-name="addr"/>
         </iterate>        
     </simple-method>
@@ -774,7 +774,7 @@
         </entity-and>
         
         <if-empty field="partyRels">
-            <make-value value-name="newEntity" entity-name="PartyRelationship"/>
+            <make-value value-field="newEntity" entity-name="PartyRelationship"/>
             <set-pk-fields map-name="parameters" value-name="newEntity"/>
             <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
             <create-value value-name="newEntity"/>
@@ -797,7 +797,7 @@
     </simple-method>
     
     <simple-method method-name="createPartyCarrierAccount" short-description="Create PartyCarrierAccount">
-        <make-value entity-name="PartyCarrierAccount" value-name="newEntity"/>
+        <make-value entity-name="PartyCarrierAccount" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.fromDate">
@@ -898,7 +898,7 @@
         <call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field-name="geoList">
             <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
         </call-class-method>
-        <iterate list-name="geoList" entry-name="countryGeo">
+        <iterate list="geoList" entry="countryGeo">
             <set field="countryName" value="${countryGeo.geoName}: ${countryGeo.geoId}"/>
             <field-to-list list-name="countryList" field-name="countryName"/>
         </iterate>
@@ -911,7 +911,7 @@
             <field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
             <field field-name="countryGeoId" type="String"/>
         </call-class-method>
-        <iterate list-name="geoList" entry-name="stateGeo">
+        <iterate list="geoList" entry="stateGeo">
             <set field="stateName" value="${stateGeo.geoName}: ${stateGeo.geoId}"/>
             <field-to-list list-name="stateList" field-name="stateName"/>
         </iterate>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Dec 30 03:28:24 2008
@@ -101,7 +101,7 @@
                 </if-not-empty>
             </if-not-empty>
 
-            <make-value entity-name="UserLogin" value-name="newUserLogin"/>
+            <make-value entity-name="UserLogin" value-field="newUserLogin"/>
             <set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId"/>
             <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword" />
             <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint" />
@@ -281,7 +281,7 @@
         </if-compare>
 
         <!-- create the PartyDataSource entry to track where this info came from... -->
-        <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
+        <make-value entity-name="PartyDataSource" value-field="partyDataSource"/>
         <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
         <set field="partyDataSource.fromDate" from-field="nowStamp" />
         <set field="partyDataSource.isCreate" value="Y" />

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml Tue Dec 30 03:28:24 2008
@@ -24,8 +24,8 @@
     <simple-method method-name="migrateFacilityRole" short-description="Migrate Data From OldFacilityRole To FacilityParty">
         <entity-condition entity-name="OldFacilityRole" list-name="oldFacilityRoles"/>
         <now-timestamp-to-env env-name="fromDate"/>
-        <iterate list-name="oldFacilityRoles" entry-name="oldFacilityRole">
-            <make-value entity-name="FacilityParty" value-name="facilityParty"/>
+        <iterate list="oldFacilityRoles" entry="oldFacilityRole">
+            <make-value entity-name="FacilityParty" value-field="facilityParty"/>
             <set field="facilityParty.facilityId" from-field="oldFacilityRole.facilityId"/>
             <set field="facilityParty.partyId" from-field="oldFacilityRole.partyId"/>
             <set field="facilityParty.roleTypeId" from-field="oldFacilityRole.roleTypeId"/>
@@ -35,7 +35,7 @@
                 <field-map field-name="roleTypeId" from-field="facilityParty.roleTypeId"/>
             </entity-one>
             <if-empty field="partyRole">
-                <make-value entity-name="PartyRole" value-name="partyRole"/>
+                <make-value entity-name="PartyRole" value-field="partyRole"/>
                 <set field="partyRole.partyId" from-field="facilityParty.partyId"/>
                 <set field="partyRole.roleTypeId" from-field="facilityParty.roleTypeId"/>
                 <create-value value-name="partyRole"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 03:28:24 2008
@@ -21,7 +21,7 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createProdCatalog" short-description="Create an ProdCatalog">
-        <make-value value-name="newEntity" entity-name="ProdCatalog"/>
+        <make-value value-field="newEntity" entity-name="ProdCatalog"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
         <if-empty field="parameters.prodCatalogId">
@@ -54,7 +54,7 @@
         </if-empty>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProdCatalogCategory"/>
+        <make-value value-field="newEntity" entity-name="ProdCatalogCategory"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -67,7 +67,7 @@
     </simple-method>
     <simple-method method-name="updateProductCategoryToProdCatalog" short-description="Remove ContactMech From ProdCatalog">
 
-        <make-value value-name="lookupPKMap" entity-name="ProdCatalogCategory"/>
+        <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProdCatalogCategory" map-name="lookupPKMap" value-name="prodCatalogCategory"/>
         <set-nonpk-fields map-name="parameters" value-name="prodCatalogCategory"/>
@@ -75,7 +75,7 @@
     </simple-method>
     <simple-method method-name="removeProductCategoryFromProdCatalog" short-description="Remove ContactMech From ProdCatalog">
 
-        <make-value value-name="lookupPKMap" entity-name="ProdCatalogCategory"/>
+        <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProdCatalogCategory" map-name="lookupPKMap" value-name="prodCatalogCategory"/>
         <remove-value value-name="prodCatalogCategory"/>
@@ -83,7 +83,7 @@
 
     <!-- Party and Catalog services -->
     <simple-method method-name="addProdCatalogToParty" short-description="Add ProdCatalog To Party">
-        <make-value value-name="newEntity" entity-name="ProdCatalogRole"/>
+        <make-value value-field="newEntity" entity-name="ProdCatalogRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -94,14 +94,14 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateProdCatalogToParty" short-description="Update ProdCatalog To Party">
-        <make-value value-name="lookupPKMap" entity-name="ProdCatalogRole"/>
+        <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProdCatalogRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeProdCatalogFromParty" short-description="Remove ProdCatalog From Party">
-        <make-value value-name="lookupPKMap" entity-name="ProdCatalogRole"/>
+        <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProdCatalogRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -137,20 +137,20 @@
             <list-to-list list-name="parameters.categories" to-list-name="categories"/>
         </if-not-empty>
         <if-not-empty field="rollups">
-            <iterate list-name="rollups" entry-name="parent">
+            <iterate list="rollups" entry="parent">
                 <get-related-one relation-name="CurrentProductCategory" value-name="parent" to-value-name="currentProductCategory"/>                    
                 <field-to-list list-name="subCategories" field-name="currentProductCategory"/>                        
             </iterate>        
             <if-not-empty field="subCategories">
                 <set field="relatedCategoryContext.categories"  from-field="subCategories"/>
-                <iterate list-name="subCategories" entry-name="subCategory">                    
+                <iterate list="subCategories" entry="subCategory">                    
                     <set field="relatedCategoryContext.parentProductCategoryId"  from-field="subCategory.productCategoryId"/>                            
                     <call-service service-name="getRelatedCategories" in-map-name="relatedCategoryContext">
                         <result-to-field result-name="categories" field-name="relCategories"/>                    
                     </call-service>                          
                     <if-not-empty field="relCategories">
                         <if-not-empty field="categories">
-                            <iterate list-name="relCategories" entry-name="relCategory">
+                            <iterate list="relCategories" entry="relCategory">
                             <call-object-method obj-field-name="categories" method-name="contains" ret-field-name="addInCategories" >
                                 <field field-name="relCategory" type="java.lang.Object"/>
                             </call-object-method>
@@ -190,7 +190,7 @@
         </call-service>
         <!-- Get the category from categories-->
         <if-not-empty field="categories">
-            <iterate list-name="categories" entry-name="category">
+            <iterate list="categories" entry="category">
                 <set field="checkImageUrlForCategoryContext.categoryId" from-field="category.productCategoryId"/>
                 <call-service service-name="checkImageUrlForCategoryAndProduct" in-map-name="checkImageUrlForCategoryContext">
                     <result-to-field result-name="fileExists" field-name="fileStatusMap.fileExists"/>
@@ -245,7 +245,7 @@
         </if-not-empty>
               
         <if-not-empty field="categoryMembers">
-            <iterate list-name="categoryMembers" entry-name="productCategoryMember">                                
+            <iterate list="categoryMembers" entry="productCategoryMember">                                
                 <set field="checkImageUrlForProductContext.productId" from-field="productCategoryMember.productId"/>
                 <call-service service-name="checkImageUrlForProduct" in-map-name="checkImageUrlForProductContext">
                     <result-to-field result-name="filesImageMap" field-name="filesImageMap"/>
@@ -294,7 +294,7 @@
                     <find-by-and entity-name="ProductAssoc" map-name="virtualProductContext" list-name="variantProducts"/>  
                     <filter-list-by-date list-name="variantProducts"/>
                     <if-not-empty field="variantProducts">
-                        <iterate entry="variantProduct" list-name="variantProducts">
+                        <iterate entry="variantProduct" list="variantProducts">
                             <!-- log level="info" message = "Variant product =====${variantProduct.productIdTo}"/ -->
                             <set field="variantProductContext.productId" from-field="variantProduct.productIdTo"/>
                             <call-service service-name="checkImageUrlForProduct" in-map-name="variantProductContext">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <!-- ProductCategoryContent -->
     <simple-method method-name="createCategoryContent" short-description="Create Content For Product Category">
-        <make-value value-name="newEntity" entity-name="ProductCategoryContent"/>
+        <make-value value-field="newEntity" entity-name="ProductCategoryContent"/>
         <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="prodCatContentTypeId"/>
     </simple-method>
     <simple-method method-name="updateCategoryContent" short-description="Update Content For Category">
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryContent"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryContent" 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="removeCategoryContent" short-description="Remove Content From Category">
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryContent"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryContent" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 03:28:24 2008
@@ -33,7 +33,7 @@
         <check-errors/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
-        <make-value value-name="newEntity" entity-name="ProductCategory"/>
+        <make-value value-field="newEntity" entity-name="ProductCategory"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <if-empty field="parameters.productCategoryId">
@@ -51,7 +51,7 @@
         <!-- if setting the primaryParentCategoryId, create a rollup entity too -->
         <!-- NOTE: this is commented out to disable because it is dangerous to add category rollups on a live site without being able to specify a fromDate
         <if-not-empty field="newEntity.primaryParentCategoryId">
-            <make-value entity-name="ProductCategoryRollup" value-name="newRollup"/>
+            <make-value entity-name="ProductCategoryRollup" value-field="newRollup"/>
             <field-to-field field-name="productCategoryId" map-name="newEntity" to-field-name="productCategoryId" to-map-name="newRollup"/>
             <field-to-field field-name="primaryParentCategoryId" map-name="newEntity" to-field-name="parentProductCategoryId" to-map-name="newRollup"/>
             <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newRollup"/>
@@ -65,9 +65,9 @@
                 <field-map field-name="partyId" from-field="userLogin.partyId"/>
                 <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="newLimitRollup" entity-name="ProductCategoryRollup"/>
+                <make-value value-field="newLimitRollup" entity-name="ProductCategoryRollup"/>
                 <set field="newLimitRollup.productCategoryId" from-field="newEntity.productCategoryId"/>
                 <set field="newLimitRollup.parentProductCategoryId" from-field="productCategoryRole.productCategoryId"/>
                 <set field="newLimitRollup.fromDate" from-field="nowTimestamp"/>
@@ -91,7 +91,7 @@
         <!-- NOTE: this is commented out to disable because it is dangerous to add category rollups on a live site without being able to specify a fromDate
         <if-not-empty field="lookedUpValue.primaryParentCategoryId">
             <if-compare-field to-field="saveIdMap.primaryParentCategoryId" field="lookedUpValue.primaryParentCategoryId" operator="not-equals">
-                <make-value entity-name="ProductCategoryRollup" value-name="newRollup"/>
+                <make-value entity-name="ProductCategoryRollup" value-field="newRollup"/>
                 <field-to-field field-name="productCategoryId" map-name="lookedUpValue" to-field-name="productCategoryId" to-map-name="newRollup"/>
                 <field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-field-name="parentProductCategoryId" to-map-name="newRollup"/>
                 <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -115,7 +115,7 @@
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
         -->
-        <make-value value-name="newEntity" entity-name="ProductCategoryMember"/>
+        <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -128,7 +128,7 @@
 
     <simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories">
         <if-instance-of field-name="parameters.categories" class="java.util.List">
-            <iterate entry="category" list-name="parameters.categories">
+            <iterate entry="category" list="parameters.categories">
                 <!-- note that the security semantics require the user to have the general admin permission,
                     or the role limited permission and association with the category, not the product -->
                 <!--
@@ -139,7 +139,7 @@
                 <check-errors/>
                  -->
 
-                <make-value value-name="newEntity" entity-name="ProductCategoryMember"/>
+                <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
                 <set field="newEntity.productCategoryId" from-field="category"/>
                 <set-pk-fields map-name="parameters" value-name="newEntity"/>
                 <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -159,7 +159,7 @@
                 <call-simple-method method-name="checkCategoryRelatedPermission"/>
                 <check-errors/>
 
-                <make-value value-name="newEntity" entity-name="ProductCategoryMember"/>
+                <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
                 <set field="newEntity.productCategoryId" from-field="parameters.categories"/>
                 <set-pk-fields map-name="parameters" value-name="newEntity"/>
                 <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -183,7 +183,7 @@
         <check-errors/>
          -->
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryMember"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryMember" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -206,7 +206,7 @@
             <store-value value-name="product"/>
         </if-compare-field>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryMember"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryMember" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -222,7 +222,7 @@
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductCategoryRole"/>
+        <make-value value-field="newEntity" entity-name="ProductCategoryRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -238,7 +238,7 @@
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryRole"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -250,7 +250,7 @@
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryRole"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -268,7 +268,7 @@
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductCategoryRollup"/>
+        <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -280,7 +280,7 @@
     </simple-method>
     <simple-method method-name="addProductCategoryToCategories" short-description="Add ProductCategory to Categories">
         <if-instance-of field-name="parameters.categories" class="java.util.List">
-            <iterate entry="category" list-name="parameters.categories">
+            <iterate entry="category" list="parameters.categories">
                 <set field="callingMethodName" value="addProductCategoryToCategories"/>
                 <set field="checkAction" value="CREATE"/>
                 <!-- note the the user must be associated with the parent category with the role limited permission -->
@@ -288,7 +288,7 @@
                 <call-simple-method method-name="checkCategoryRelatedPermission"/>
                 <check-errors/>
 
-                <make-value value-name="newEntity" entity-name="ProductCategoryRollup"/>
+                <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
                 <set field="newEntity.parentProductCategoryId" from-field="category"/>
                 <set-pk-fields map-name="parameters" value-name="newEntity"/>
                 <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -307,7 +307,7 @@
                 <call-simple-method method-name="checkCategoryRelatedPermission"/>
                 <check-errors/>
 
-                <make-value value-name="newEntity" entity-name="ProductCategoryRollup"/>
+                <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
                 <set field="newEntity.parentProductCategoryId" from-field="parameters.categories"/>
                 <set-pk-fields map-name="parameters" value-name="newEntity"/>
                 <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -328,7 +328,7 @@
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryRollup"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRollup" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -342,7 +342,7 @@
         <call-simple-method method-name="checkCategoryRelatedPermission"/>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryRollup"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRollup" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -370,7 +370,7 @@
         </if-not-empty>
 
         <!-- add each to a list to store and then store all and let the entity engine do inserts or updates as needed; much more reliable/useful -->
-        <iterate entry="productCategoryMember" list-name="productCategoryMembers">
+        <iterate entry="productCategoryMember" list="productCategoryMembers">
             <clone-value value-name="productCategoryMember" new-value-name="newProductCategoryMember"/>
             <set field="newProductCategoryMember.productCategoryId" from-field="parameters.productCategoryIdTo"/>
             <field-to-list field-name="newProductCategoryMember" list-name="pcmsToStore"/>
@@ -386,7 +386,7 @@
                 <filter-list-by-date list-name="productCategoryRollups" valid-date-name="validDate"/>
             </if-not-empty>
 
-            <iterate entry="productCategoryRollup" list-name="productCategoryRollups">
+            <iterate entry="productCategoryRollup" list="productCategoryRollups">
                 <set field="callServiceMap.productCategoryId" from-field="productCategoryRollup.productCategoryId"/>
                 <set field="callServiceMap.productCategoryIdTo" from-field="parameters.productCategoryIdTo"/>
                 <set field="callServiceMap.validDate" from-field="parameters.validDate"/>
@@ -422,7 +422,7 @@
         </if-not-empty>
         
         <!-- add each to a list to store and then store all and let the entity engine do inserts or updates as needed; much more reliable/useful -->
-        <iterate entry="categoryEntity" list-name="categoryEntities">
+        <iterate entry="categoryEntity" list="categoryEntities">
             <clone-value value-name="categoryEntity" new-value-name="newCategoryEntity"/>
             <set field="newCategoryEntity.productCategoryId" from-field="productCategoryIdTo"/>
             <field-to-list field-name="newCategoryEntity" list-name="entitiesToStore"/>
@@ -447,7 +447,7 @@
             <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/>
         </entity-and>
 
-        <iterate entry="productCategoryMember" list-name="productCategoryMembers">
+        <iterate entry="productCategoryMember" list="productCategoryMembers">
             <set field="productCategoryMember.thruDate" from-field="expireTimestamp"/>
             <store-value value-name="productCategoryMember"/>
         </iterate>
@@ -469,7 +469,7 @@
             <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/>
         </entity-and>
 
-        <iterate entry="productCategoryMember" list-name="productCategoryMembers">
+        <iterate entry="productCategoryMember" list="productCategoryMembers">
             <if-compare-field field="productCategoryMember.thruDate" to-field="expireTimestamp" operator="less" type="Timestamp">
                 <remove-value value-name="productCategoryMember"/>
             </if-compare-field>
@@ -602,7 +602,7 @@
             requires a new find-by map -->
         <if-not-empty field="parameters.duplicateParentRollup">
             <find-by-and entity-name="ProductCategoryRollup" map-name="categoryFindContext" list-name="foundValues"/>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set field="newTempValue.productCategoryId" from-field="parameters.productCategoryId"/>
                 <create-value value-name="newTempValue"/>
@@ -612,7 +612,7 @@
             <entity-and entity-name="ProductCategoryRollup" list-name="foundValues">
                 <field-map field-name="parentProductCategoryId" from-field="parameters.oldProductCategoryId"/>
             </entity-and>
-            <iterate entry="foundValue" list-name="foundValues">
+            <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set field="newTempValue.parentProductCategoryId" from-field="parameters.productCategoryId"/>
                 <create-value value-name="newTempValue"/>
@@ -631,7 +631,7 @@
         </check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductCategoryAttribute"/>
+        <make-value value-field="newEntity" entity-name="ProductCategoryAttribute"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -644,7 +644,7 @@
           </check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryAttribute"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryAttribute" map-name="lookupPKMap" value-name="ProductCategoryAttributeInstance"/>
         <set-nonpk-fields map-name="parameters" value-name="ProductCategoryAttributeInstance"/>
@@ -657,7 +657,7 @@
            </check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupPKMap" entity-name="ProductCategoryAttribute"/>
+        <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryAttribute" map-name="lookupPKMap" value-name="ProductCategoryAttributeInstance"/>
         <remove-value value-name="ProductCategoryAttributeInstance"/>
@@ -666,7 +666,7 @@
 
     <!-- ProductCategoryLink Create/Update/Delete"-->
     <simple-method method-name="createProductCategoryLink" short-description="create a ProductCategoryLink">
-        <make-value entity-name="ProductCategoryLink" value-name="newEntity"/>
+        <make-value entity-name="ProductCategoryLink" value-field="newEntity"/>
         <set field="newEntity.productCategoryId" from-field="parameters.productCategoryId"/>
 
         <!-- don't set the fromDate yet; let's get the seq ID first -->
@@ -802,7 +802,7 @@
                 </condition-list>
             </condition-list>
         </entity-condition>
-        <iterate entry="prodCatalogCategory" list-name="prodCatalogCategoryList">
+        <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList">
             <!-- Do not do a permission check unless the ProdCatalog requires it -->
             <entity-one entity-name="ProdCatalog" value-name="prodCatalog" auto-field-map="false">
                 <field-map field-name="prodCatalogId" from-field="prodCatalogCategory.prodCatalogId"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml Tue Dec 30 03:28:24 2008
@@ -25,7 +25,7 @@
             <fail-property resource="ProductUiLabels" property="ProductCreateCommunicationEventProductPermissionError"/>
         </check-permission>
         <check-errors/>
-        <make-value value-name="newEntity" entity-name="CommunicationEventProduct"/>
+        <make-value value-field="newEntity" entity-name="CommunicationEventProduct"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>    

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.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="ProductConfig"/>
+        <make-value value-field="newEntity" entity-name="ProductConfig"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -48,7 +48,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductConfig" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductConfig" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductConfig" map-name="lookupPKMap" value-name="lookedUpValue"/>
 
@@ -63,7 +63,7 @@
         <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="ProductConfig" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductConfig" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductConfig" map-name="lookupPKMap" value-name="lookedUpValue"/>
 
@@ -76,7 +76,7 @@
             <fail-message message="Security Error: to run createProductConfigItem you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigItem" value-name="newEntity"/>
+        <make-value entity-name="ProductConfigItem" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="ProductConfigItem" env-name="newEntity.configItemId"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -87,7 +87,7 @@
             <fail-message message="Security Error: to run updateProductConfigItem you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigItem" value-name="lookupKeyValue"/>
+        <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -98,7 +98,7 @@
             <fail-message message="Security Error: to run deleteProductConfigItem you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigItem" value-name="lookupKeyValue"/>
+        <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -109,7 +109,7 @@
             <fail-message message="Security Error: to run createProductConfigOption you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigOption" value-name="newEntity"/>
+        <make-value entity-name="ProductConfigOption" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <sequenced-id-to-env sequence-name="ProductConfigOption" env-name="newEntity.configOptionId"/>
@@ -122,7 +122,7 @@
             <fail-message message="Security Error: to run updateProductConfigOption you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigOption" value-name="lookupKeyValue"/>
+        <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -133,7 +133,7 @@
             <fail-message message="Security Error: to run deleteProductConfigOption you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigOption" value-name="lookupKeyValue"/>
+        <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -144,7 +144,7 @@
             <fail-message message="Security Error: to run createProductConfigProduct you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigProduct" value-name="newEntity"/>
+        <make-value entity-name="ProductConfigProduct" 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"/>
@@ -154,7 +154,7 @@
             <fail-message message="Security Error: to run updateProductConfigProduct you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigProduct" value-name="lookupKeyValue"/>
+        <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -165,7 +165,7 @@
             <fail-message message="Security Error: to run deleteProductConfigProduct you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ProductConfigProduct" value-name="lookupKeyValue"/>
+        <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <!-- ProductConfigItemContent -->
     <simple-method method-name="createProductConfigItemContent" short-description="Create Content For ProductConfigItem">
-        <make-value value-name="newEntity" entity-name="ProdConfItemContent"/>
+        <make-value value-field="newEntity" entity-name="ProdConfItemContent"/>
         <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="confItemContentTypeId"/>
     </simple-method>
     <simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem">
-        <make-value value-name="lookupPKMap" entity-name="ProdConfItemContent"/>
+        <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
         <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="removeProductConfigItemContent" short-description="Remove Content From ProductConfigItem">
-        <make-value value-name="lookupPKMap" entity-name="ProdConfItemContent"/>
+        <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
         <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/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <!-- CostComponent services -->
     <simple-method method-name="createCostComponent" short-description="Create a CostComponent">
-        <make-value value-name="newEntity" entity-name="CostComponent"/>
+        <make-value value-field="newEntity" entity-name="CostComponent"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/>
         <field-to-result field-name="costComponentId" map-name="newEntity"/>
@@ -47,7 +47,7 @@
         <set from-field="parameters.costComponentTypeId" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="existingCosts"/>
         <filter-list-by-date list-name="existingCosts"/>
-        <iterate list-name="existingCosts" entry-name="existingCost">
+        <iterate list="existingCosts" entry="existingCost">
             <now-timestamp-to-env env-name="existingCost.thruDate"/>
             <store-value value-name="existingCost"/>
         </iterate>
@@ -59,12 +59,12 @@
         <set from-field="parameters.costComponentTypeId" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="existingCosts"/>
         <filter-list-by-date list-name="existingCosts"/>
-        <iterate list-name="existingCosts" entry-name="existingCost">
+        <iterate list="existingCosts" entry="existingCost">
             <now-timestamp-to-env env-name="existingCost.thruDate"/>
             <store-value value-name="existingCost"/>
         </iterate>
         <!-- The new cost is created -->
-        <make-value value-name="newEntity" entity-name="CostComponent"/>
+        <make-value value-field="newEntity" entity-name="CostComponent"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/>
         <if-empty field="newEntity.fromDate">
@@ -234,7 +234,7 @@
         </entity-condition>
         <set from-field="parameters.currencyUomId" field="inMap.currencyUomId"/>
         <set from-field="parameters.costComponentTypePrefix" field="inMap.costComponentTypePrefix"/>
-        <iterate list-name="products" entry-name="product">
+        <iterate list="products" entry="product">
             <set from-field="product.productId" field="inMap.productId"/>
             <call-service service-name="calculateProductCosts" in-map-name="inMap"/>
         </iterate>
@@ -252,7 +252,7 @@
             <result-to-field result-name="componentsMap"/>
         </call-service>
         <if-not-empty field="componentsMap">
-            <iterate entry="componentMap" list-name="componentsMap">
+            <iterate entry="componentMap" list="componentsMap">
                 <clear-field field-name="inputMap"/>
                 <set field="product" from-field="componentMap.product"/>
                 <set field="inputMap.productId" from-field="product.productId"/>
@@ -288,7 +288,7 @@
             <result-to-field result-name="tasks"/>
             <result-to-field result-name="routing"/>
         </call-service>
-        <iterate entry="task" list-name="tasks">
+        <iterate entry="task" list="tasks">
             <clear-field field-name="callSvcMap"/>
             <set from-field="task.workEffortIdTo" field="callSvcMap.workEffortId"/>
             <set from-field="parameters.currencyUomId" field="callSvcMap.currencyUomId"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 03:28:24 2008
@@ -24,7 +24,7 @@
         <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureCategory you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
         
-        <make-value entity-name="ProductFeatureCategory" value-name="newEntity"/>
+        <make-value entity-name="ProductFeatureCategory" value-field="newEntity"/>
         <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
 
         <sequenced-id-to-env sequence-name="ProductFeatureCategory" env-name="newEntity.productFeatureCategoryId"/>
@@ -45,7 +45,7 @@
         <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeature you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
         
-        <make-value value-name="newEntity" entity-name="ProductFeature"/>
+        <make-value value-field="newEntity" entity-name="ProductFeature"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="parameters.productFeatureId">
             <sequenced-id-to-env sequence-name="ProductFeature" env-name="newEntity.productFeatureId"/>
@@ -75,7 +75,7 @@
         <if-empty field="parameters.fromDate">
             <now-timestamp-to-env env-name="parameters.fromDate"/>
         </if-empty>
-        <make-value value-name="newEntity" entity-name="ProductFeatureAppl"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureAppl"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -120,7 +120,7 @@
             <field-map field-name="idCode" from-field="parameters.idCode"/>
         </entity-and>
         
-        <iterate entry="productFeature" list-name="productFeatures">
+        <iterate entry="productFeature" list="productFeatures">
             <set-service-fields service-name="applyFeatureToProduct" map-name="parameters" to-map-name="applyFeatureContext"/>
             <set field="applyFeatureContext.productFeatureId" from-field="productFeature.productFeatureId"/>
 
@@ -137,7 +137,7 @@
         <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureCategoryAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductFeatureCategoryAppl"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureCategoryAppl"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -151,7 +151,7 @@
         <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureCategoryAppl you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -161,7 +161,7 @@
         <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureCategoryAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -172,7 +172,7 @@
         <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureCatGrpAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductFeatureCatGrpAppl"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureCatGrpAppl"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -186,7 +186,7 @@
         <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureCatGrpAppl you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -196,7 +196,7 @@
         <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureCatGrpAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -207,7 +207,7 @@
         <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureGroup you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductFeatureGroup"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureGroup"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <sequenced-id-to-env sequence-name="ProductFeatureGroup" env-name="newEntity.productFeatureGroupId"/>
@@ -227,7 +227,7 @@
         <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureGroupAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="newEntity" entity-name="ProductFeatureGroupAppl"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureGroupAppl"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -241,7 +241,7 @@
         <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureGroupAppl you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ProductFeatureGroupAppl" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -251,7 +251,7 @@
         <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureGroupAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ProductFeatureGroupAppl" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -261,7 +261,7 @@
     <simple-method method-name="createProductFeatureIactn" short-description="Create a Product Feature Interaction">
         <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureIactn you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
-        <make-value value-name="newEntity" entity-name="ProductFeatureIactn"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureIactn"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -270,7 +270,7 @@
         <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureInteraction you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
         
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureIactn"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureIactn"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -294,7 +294,7 @@
         </if>
         <check-errors/>
                 
-        <make-value value-name="newEntity" entity-name="ProductFeatureType"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureType"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -304,7 +304,7 @@
         <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureType you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureType"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -314,7 +314,7 @@
         <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureType you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value value-name="lookupKeyValue" entity-name="ProductFeatureType"/>
+        <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -326,7 +326,7 @@
             <fail-message message="Security Error: to run createProductFeatureApplAttr you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value value-name="newEntity" entity-name="ProductFeatureApplAttr"/>
+        <make-value value-field="newEntity" entity-name="ProductFeatureApplAttr"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.fromDate">
@@ -371,7 +371,7 @@
     
     <!-- Feature Price Service -->
     <simple-method method-name="createFeaturePrice" short-description="Create a Feature Price">
-        <make-value value-name="newEntity" entity-name="ProductFeaturePrice"/>
+        <make-value value-field="newEntity" entity-name="ProductFeaturePrice"/>
         <if-empty field="parameters.productFeatureId">
             <sequenced-id-to-env sequence-name="ProductFeaturePrice" env-name="parameters.productFeatureId"/>
         </if-empty>
@@ -404,7 +404,7 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteFeaturePrice" short-description="Delete a feature price">
-        <make-value entity-name="ProductFeaturePrice" value-name="lookupPKMap"/>
+        <make-value entity-name="ProductFeaturePrice" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductFeaturePrice" map-name="lookupPKMap" value-name="lookedUpValue"/>
         

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Tue Dec 30 03:28:24 2008
@@ -39,7 +39,7 @@
         
                 <!-- now go through each order item and call a service to issue the inventory -->
                 <if-compare field="iiCount" operator="greater" value="0" type="Double">
-                    <iterate list-name="orderItemList" entry-name="orderItem">
+                    <iterate list="orderItemList" entry="orderItem">
                         <if-not-empty field="orderItem.productId">
                             <clear-field field-name="callSvcMap"/>
                             <set-service-fields to-map-name="callSvcMap" service-name="issueImmediatelyFulfilledOrderItem" map-name="orderItem"/>
@@ -115,7 +115,7 @@
     
             <set field="parameters.quantityNotIssued" from-field="orderItem.quantity" />
 
-            <iterate entry="inventoryItem" list-name="inventoryItemList">
+            <iterate entry="inventoryItem" list="inventoryItemList">
                 <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
                 <call-simple-method method-name="issueImmediateForInventoryItemInline"/>
             </iterate>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 03:28:24 2008
@@ -91,10 +91,10 @@
                     </condition-list>
                     <order-by field-name="${orderByString}"/>
                 </entity-condition>
-                <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations">
+                <iterate entry="inventoryItemAndLocation" list="inventoryItemAndLocations">
                     <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double">
                         <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
-                        <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-name="inventoryItem"/>
+                        <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-field="inventoryItem"/>
                         <call-simple-method method-name="reserveForInventoryItemInline"/>
                     </if-compare>
                 </iterate>
@@ -111,10 +111,10 @@
                         </condition-list>
                         <order-by field-name="${orderByString}"/>
                     </entity-condition>
-                    <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations">
+                    <iterate entry="inventoryItemAndLocation" list="inventoryItemAndLocations">
                         <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double">
                             <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
-                            <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-name="inventoryItem"/>
+                            <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-field="inventoryItem"/>
                             <call-simple-method method-name="reserveForInventoryItemInline"/>
                         </if-compare>
                     </iterate>
@@ -132,7 +132,7 @@
                         </condition-list>
                         <order-by field-name="${orderByString}"/>
                     </entity-condition>
-                    <iterate entry="inventoryItem" list-name="inventoryItems">
+                    <iterate entry="inventoryItem" list="inventoryItems">
                         <if>
                             <condition>
                                 <and>
@@ -493,7 +493,7 @@
 
         <if-empty field="checkOisgirEntity">
             <!-- create OrderItemShipGrpInvRes record -->
-            <make-value entity-name="OrderItemShipGrpInvRes" value-name="newOisgirEntity"/>
+            <make-value entity-name="OrderItemShipGrpInvRes" value-field="newOisgirEntity"/>
             <set-pk-fields map-name="parameters" value-name="newOisgirEntity"/>
             <set-nonpk-fields map-name="parameters" value-name="newOisgirEntity"/>
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -534,7 +534,7 @@
             <log level="verbose" message="OISGIR Cancel for single item : ${oisgirListLookupMap}"/>
         </if-not-empty>
         <find-by-and entity-name="OrderItemShipGrpInvRes" map-name="oisgirListLookupMap" list-name="oisgirList" use-cache="false"/>
-        <iterate entry="oisgir" list-name="oisgirList">
+        <iterate entry="oisgir" list="oisgirList">
             <set from-field="oisgir.orderId" field="cancelOisgirMap.orderId"/>
             <set from-field="oisgir.orderItemSeqId" field="cancelOisgirMap.orderItemSeqId"/>
             <set from-field="oisgir.shipGroupSeqId" field="cancelOisgirMap.shipGroupSeqId"/>
@@ -563,7 +563,7 @@
             <set from-field="parameters.orderItemSeqId" field="oisgirListLookupMap.orderItemSeqId"/>
             <set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/>
             <find-by-and entity-name="OrderItemShipGrpInvRes" map-name="oisgirListLookupMap" list-name="oisgirList" use-cache="false"/>
-            <iterate entry="oisgir" list-name="oisgirList">
+            <iterate entry="oisgir" list="oisgirList">
                 <if-compare field="toCancelAmount" operator="greater" value="0" type="Double">
                     <if-compare-field field="oisgir.quantity" to-field="toCancelAmount" operator="greater-equals" type="Double">
                         <set from-field="toCancelAmount" field="cancelOisgirMap.cancelQuantity"/>