svn commit: r730101 [3/3] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounting/script/org/ofbiz/accounting/payment/ applications/content/script/org/ofbiz/content/compdoc/ applications/content/script/or...

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Tue Dec 30 03:51:58 2008
@@ -49,7 +49,7 @@
         <check-errors/>
 
         <set from-field="parameters.productPromoId" field="lookupPKMap.productPromoId"/>
-        <find-by-primary-key entity-name="ProductPromo" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductPromo" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
         <if-empty field="lookedUpValue.userEntered">
@@ -70,7 +70,7 @@
         <!-- TODO: if a force remove flag is passed, remove related info first, maybe just rules, store assocs, etc -->
 
         <set from-field="parameters.productPromoId" field="lookupPKMap.productPromoId"/>
-        <find-by-primary-key entity-name="ProductPromo" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductPromo" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -95,7 +95,7 @@
 
         <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -106,7 +106,7 @@
 
         <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -129,7 +129,7 @@
 
         <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -140,7 +140,7 @@
 
         <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -177,7 +177,7 @@
 
         <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -193,7 +193,7 @@
 
         <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -216,7 +216,7 @@
 
         <make-value entity-name="ProductPromoCodeEmail" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -239,7 +239,7 @@
 
         <make-value entity-name="ProductPromoCodeParty" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -264,7 +264,7 @@
 
         <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPromoCond" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -275,7 +275,7 @@
 
         <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPromoCond" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductPromoCond" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -298,7 +298,7 @@
 
         <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -309,7 +309,7 @@
 
         <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -334,7 +334,7 @@
 
         <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPromoRule" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductPromoRule" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -345,7 +345,7 @@
 
         <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductPromoRule" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductPromoRule" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -373,7 +373,7 @@
 
         <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -384,7 +384,7 @@
 
         <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Tue Dec 30 03:51:58 2008
@@ -314,7 +314,7 @@
         <make-value value-field="lookUpMap" entity-name="FacilityContactMechPurpose"/>
 
         <set-pk-fields map-name="parameters" value-name="lookUpMap"/>
-        <find-by-primary-key value-field="purposeEntity" entity-name="FacilityContactMechPurpose" map-name="lookUpMap"/>
+        <find-by-primary-key value-field="purposeEntity" entity-name="FacilityContactMechPurpose" map="lookUpMap"/>
 
         <if-empty field="purposeEntity">
             <add-error><fail-message message="Unable to locate purpose; cannot delete"/></add-error>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Tue Dec 30 03:51:58 2008
@@ -34,13 +34,13 @@
     </simple-method>
     <simple-method method-name="updateFacility" short-description="Update a Facility">
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
-        <find-by-primary-key entity-name="Facility" map-name="lookupPKMap" value-field="facility"/>
+        <find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/>
         <set-nonpk-fields map-name="parameters" value-name="facility"/>
         <store-value value-name="facility"/>
     </simple-method>
     <simple-method method-name="deleteFacility" short-description="Delete a Facility">
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
-        <find-by-primary-key entity-name="Facility" map-name="lookupPKMap" value-field="facility"/>
+        <find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/>
         <remove-value value-name="facility"/>
     </simple-method>
 
@@ -53,7 +53,7 @@
     <simple-method method-name="removeContactMechFromFacility" short-description="Remove ContactMech From Facility">
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <set field="lookupPKMap.contactMechId" from-field="parameters.contactMechId" />
-        <find-by-primary-key entity-name="FacilityContactMech" map-name="lookupPKMap" value-field="facilityContactMech"/>
+        <find-by-primary-key entity-name="FacilityContactMech" map="lookupPKMap" value-field="facilityContactMech"/>
         <remove-value value-name="facilityContactMech"/>
     </simple-method>
     
@@ -68,12 +68,12 @@
         <if-not-empty field="locationSeqId">
             <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" />
             <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" />
-            <find-by-primary-key entity-name="FacilityLocation" map-name="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
+            <find-by-primary-key entity-name="FacilityLocation" map="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
             <if-not-empty field="checkLocationSeqIdValue">
                 <set field="locationSeqId" value="${locationSeqId}_2" />
                 <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" />
                 <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" />
-                <find-by-primary-key entity-name="FacilityLocation" map-name="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
+                <find-by-primary-key entity-name="FacilityLocation" map="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
                 <if-not-empty field="checkLocationSeqIdValue">
                     <set field="locationSeqId" value="" />
                 </if-not-empty>
@@ -92,14 +92,14 @@
     <simple-method method-name="updateFacilityLocation" short-description="Update a Facility Location">
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" />
-        <find-by-primary-key entity-name="FacilityLocation" map-name="lookupPKMap" value-field="facilityLocation"/>
+        <find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/>
         <set-nonpk-fields map-name="parameters" value-name="facilityLocation"/>
         <store-value value-name="facilityLocation"/>
     </simple-method>
     <simple-method method-name="deleteFacilityLocation" short-description="Delete a Facility Location">
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" />
-        <find-by-primary-key entity-name="FacilityLocation" map-name="lookupPKMap" value-field="facilityLocation"/>
+        <find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/>
         <remove-value value-name="facilityLocation"/>
     </simple-method>    
     
@@ -117,13 +117,13 @@
     </simple-method>
     <simple-method method-name="updateFacilityGroup" short-description="Update an Facility Group">
         <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" />
-        <find-by-primary-key entity-name="FacilityGroup" map-name="lookupPKMap" value-field="facilityGroup"/>
+        <find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/>
         <set-nonpk-fields map-name="parameters" value-name="facilityGroup"/>
         <store-value value-name="facilityGroup"/>
     </simple-method>
     <simple-method method-name="deleteFacilityGroup" short-description="Delete an Facility Group">
         <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" />
-        <find-by-primary-key entity-name="FacilityGroup" map-name="lookupPKMap" value-field="facilityGroup"/>
+        <find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/>
         <remove-value value-name="facilityGroup"/>
     </simple-method>    
     
@@ -143,14 +143,14 @@
     <simple-method method-name="updateFacilityToGroup" short-description="Update Facility to FacilityGroup Application">
         <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupMember" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="FacilityGroupMember" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeFacilityFromGroup" short-description="Remove Facility From FacilityGroup">
         <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupMember" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="FacilityGroupMember" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -170,14 +170,14 @@
     <simple-method method-name="updateFacilityGroupToGroup" short-description="Update FacilityGroup to FacilityGroup Rollup">
         <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupRollup" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="FacilityGroupRollup" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeFacilityGroupFromGroup" short-description="Remove FacilityGroup From FacilityGroup">
         <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupRollup" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="FacilityGroupRollup" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>    
         
@@ -185,7 +185,7 @@
     <simple-method method-name="addPartyToFacility" short-description="Add Party to Facility">
         <set from-field="parameters.partyId" field="lookupPKMap.partyId"/>
         <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
-        <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-field="partyRole"/>
+        <find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="partyRole"/>
         <if-empty field="partyRole">
             <make-value value-field="partyRole" entity-name="PartyRole"/>
             <set-pk-fields map-name="lookupPKMap" value-name="partyRole"/>
@@ -217,7 +217,7 @@
     <simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup">
         <make-value value-field="lookupPKMap" entity-name="FacilityGroupRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupRole" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="FacilityGroupRole" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>            
     

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 03:51:58 2008
@@ -59,7 +59,7 @@
         <check-errors/>
 
         <set from-field="parameters.productStoreId" field="lookupPKMap.productStoreId"/>
-        <find-by-primary-key entity-name="ProductStore" map-name="lookupPKMap" value-field="store"/>
+        <find-by-primary-key entity-name="ProductStore" map="lookupPKMap" value-field="store"/>
         <set from-field="store.inventoryFacilityId" field="oldFacilityId"/>
         <set-nonpk-fields map-name="parameters" value-name="store"/>
 
@@ -119,7 +119,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -129,7 +129,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -149,7 +149,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductStorePaymentSetting" map-name="lookupPKMap" value-field="setting"/>
+        <find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/>
         <set-nonpk-fields map-name="parameters" value-name="setting"/>
         <store-value value-name="setting"/>
     </simple-method>
@@ -159,7 +159,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductStorePaymentSetting" map-name="lookupPKMap" value-field="setting"/>
+        <find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/>
         <set-nonpk-fields map-name="parameters" value-name="setting"/>
         <remove-value value-name="setting"/>
     </simple-method>
@@ -185,7 +185,7 @@
 
         <make-value value-field="lookupKeyValue" entity-name="ProductStoreEmailSetting"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ProductStoreEmailSetting" map-name="lookupKeyValue" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupKeyValue" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -197,7 +197,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreEmailSetting"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductStoreEmailSetting" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -240,7 +240,7 @@
 
         <make-value value-field="lookupKeyValue" entity-name="ProductStoreShipmentMeth"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ProductStoreShipmentMeth" map-name="lookupKeyValue" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupKeyValue" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -252,7 +252,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreShipmentMeth"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProductStoreShipmentMeth" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -278,7 +278,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
         <if-empty field="lookedUpValue.thruDate">
@@ -313,7 +313,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -323,7 +323,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -351,7 +351,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ProductStoreSurveyAppl"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
         <if-empty field="lookedUpValue.thruDate">
@@ -377,7 +377,7 @@
 
         <make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/>
         <set-pk-fields value-name="lookupPk" map-name="parameters"/>
-        <find-by-primary-key map-name="lookupPk" value-field="finAccountSetting"/>
+        <find-by-primary-key map="lookupPk" value-field="finAccountSetting"/>
 
         <set-nonpk-fields value-name="finAccountSetting" map-name="parameters"/>
         <store-value value-name="finAccountSetting"/>
@@ -388,7 +388,7 @@
 
         <make-value value-field="lookupPk" entity-name="ProductStoreFinActSetting"/>
         <set-pk-fields value-name="lookupPk" map-name="parameters"/>
-        <find-by-primary-key map-name="lookupPk" value-field="finAccountSetting"/>
+        <find-by-primary-key map="lookupPk" value-field="finAccountSetting"/>
         <remove-value value-name="finAccountSetting"/>
     </simple-method>
 

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml Tue Dec 30 03:51:58 2008
@@ -38,7 +38,7 @@
         <make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         
-        <find-by-primary-key entity-name="SupplierProduct" map-name="lookupPKMap" value-field="sprod"/>
+        <find-by-primary-key entity-name="SupplierProduct" map="lookupPKMap" value-field="sprod"/>
         <set-nonpk-fields map-name="parameters" value-name="sprod"/>
         <store-value value-name="sprod"/>
     </simple-method>
@@ -50,7 +50,7 @@
         <make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         
-        <find-by-primary-key entity-name="SupplierProduct" map-name="lookupPKMap" value-field="sprod"/>                
+        <find-by-primary-key entity-name="SupplierProduct" map="lookupPKMap" value-field="sprod"/>                
         <remove-value value-name="sprod"/>
     </simple-method>
 

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 03:51:58 2008
@@ -143,13 +143,13 @@
         <!-- get orderItemShipGrpInvRes -->
         <make-value entity-name="OrderItemShipGrpInvRes" value-field="OrderItemShipGrpInvResLookupPk"/>
         <set-pk-fields value-name="OrderItemShipGrpInvResLookupPk" map-name="parameters"/>
-        <find-by-primary-key map-name="OrderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>
+        <find-by-primary-key map="OrderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>
         <log level="info" message="order item ship grp inv res info: ${orderItemShipGrpInvRes}"/>
 
         <!-- get orderHeader -->
         <make-value entity-name="OrderHeader" value-field="orderHeaderLookupPk"/>
         <set-pk-fields value-name="orderHeaderLookupPk" map-name="parameters"/>
-        <find-by-primary-key map-name="orderHeaderLookupPk" value-field="orderHeader"/>
+        <find-by-primary-key map="orderHeaderLookupPk" value-field="orderHeader"/>
 
         <!-- make sure the order is of orderTypeId: SALES_ORDER -->
         <if-compare field="orderHeader.orderTypeId" operator="not-equals" value="SALES_ORDER">
@@ -201,7 +201,7 @@
                 <make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
                 <set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
                 <set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
-                <find-by-primary-key map-name="shipmentItemLookupPk" value-field="shipmentItem"/>
+                <find-by-primary-key map="shipmentItemLookupPk" value-field="shipmentItem"/>
                 <remove-value value-name="orderShipment"/>
             </if-not-empty>
             <if-compare value="0" operator="not-equals" field="qtyForShipmentItem" type="Double">
@@ -223,7 +223,7 @@
             <make-value entity-name="ShipmentItem" value-field="shipmentItemLookupPk"/>
             <set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/>
             <set from-field="orderShipment.shipmentItemSeqId" field="shipmentItemLookupPk.shipmentItemSeqId"/>
-            <find-by-primary-key map-name="shipmentItemLookupPk" value-field="shipmentItem"/>
+            <find-by-primary-key map="shipmentItemLookupPk" value-field="shipmentItem"/>
         </else>
         </if-compare>
 
@@ -294,7 +294,7 @@
                 <result-to-field result-name="shipmentItemSeqId" map-name="shipmentItemLookupPk"/>
             </call-service>
             <set from-field="parameters.shipmentId" field="shipmentItemLookupPk.shipmentId"/>
-            <find-by-primary-key entity-name="ShipmentItem" map-name="shipmentItemLookupPk" value-field="shipmentItem"/>
+            <find-by-primary-key entity-name="ShipmentItem" map="shipmentItemLookupPk" value-field="shipmentItem"/>
         <else>
             <calculate field-name="quantity" map-name="shipmentItem">
                 <calcop operator="add" field-name="quantity" map-name="shipmentItem">
@@ -335,7 +335,7 @@
         <make-value entity-name="PartyRole" value-field="partyRole"/>
         <set field="partyRole.partyId" from-field="userLogin.partyId"/>
         <set field="partyRole.roleTypeId" value="PACKER"/>
-        <find-by-primary-key entity-name="PartyRole" map-name="partyRole" value-field="checkPartyRole"/>
+        <find-by-primary-key entity-name="PartyRole" map="partyRole" value-field="checkPartyRole"/>
         <if-empty field="checkPartyRole">
             <create-value value-name="partyRole"/>
         </if-empty>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 03:51:58 2008
@@ -604,7 +604,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="Picklist"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
 
         <if-not-empty field="parameters.statusId">
             <if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
@@ -647,7 +647,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="Picklist"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -673,7 +673,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="PicklistBin"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
         <store-value value-name="lookedUpValue"/>
@@ -686,7 +686,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="PicklistBin"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -714,7 +714,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
 
         <if-not-empty field="parameters.itemStatusId">
             <if-compare-field field="parameters.itemStatusId" to-field="lookedUpValue.itemStatusId" operator="not-equals">
@@ -749,7 +749,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="setPicklistItemToComplete" short-description="Set the status of a pick list item to completed">
@@ -786,7 +786,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="PicklistRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
         <store-value value-name="lookedUpValue"/>
@@ -799,7 +799,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="PicklistRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -1238,12 +1238,12 @@
         <!-- find the picklist bin -->
         <make-value value-field="binLookup" entity-name="PicklistBin"/>
         <set-pk-fields map-name="parameters" value-name="binLookup"/>
-        <find-by-primary-key map-name="binLookup" value-field="picklistBin"/>
+        <find-by-primary-key map="binLookup" value-field="picklistBin"/>
 
         <!-- find the pick list -->
         <make-value value-field="plLookup" entity-name="Picklist"/>
         <set-pk-fields map-name="picklistBin" value-name="plLookup"/>
-        <find-by-primary-key map-name="plLookup" value-field="picklist"/>
+        <find-by-primary-key map="plLookup" value-field="picklist"/>
 
         <!-- find all related picklist items -->
         <entity-and entity-name="PicklistItemAndBin" list-name="picklistItem">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 03:51:58 2008
@@ -67,7 +67,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentReceiptRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentReceiptRole" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentReceiptRole" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>  
     

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 03:51:58 2008
@@ -111,7 +111,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="Shipment"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
 
         <!-- put the type in return map so that service consumer knows what type of shipment was updated -->
         <field-to-result field-name="lookedUpValue.shipmentTypeId" result-name="shipmentTypeId"/>
@@ -179,7 +179,7 @@
             </condition>
             <then>
                 <set from-field="lookedUpValue.estimatedArrivalWorkEffId" field="estimatedArrivalWorkEffortMap.workEffortId"/>
-                <find-by-primary-key entity-name="WorkEffort" map-name="estimatedArrivalWorkEffortMap" value-field="estimatedArrivalWorkEffort"/>
+                <find-by-primary-key entity-name="WorkEffort" map="estimatedArrivalWorkEffortMap" value-field="estimatedArrivalWorkEffort"/>
                 <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedStartDate"/>
                 <set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedCompletionDate"/>
                 <set from-field="parameters.destinationFacilityId" field="estimatedArrivalWorkEffort.facilityId"/>
@@ -804,7 +804,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentItem" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -818,7 +818,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentItem" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -941,7 +941,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentPackage" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentPackage" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
 
@@ -1008,7 +1008,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentPackageContent" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -1022,7 +1022,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentPackageContent" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="addShipmentContentToPackage" short-description="Add Shipment Content To Package">
@@ -1034,7 +1034,7 @@
         <check-errors/>        
         <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <find-by-primary-key value-field="shipmentPackageContent" map-name="newEntity"/>
+        <find-by-primary-key value-field="shipmentPackageContent" map="newEntity"/>
         <log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/>
         <if-empty field="shipmentPackageContent">            
             <set-service-fields service-name="createShipmentPackageContent" map-name="parameters" to-map-name="createSPCMap"/>
@@ -1075,7 +1075,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -1089,7 +1089,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -1114,7 +1114,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentContactMech"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentContactMech" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentContactMech" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -1128,7 +1128,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="ShipmentContactMech"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ShipmentContactMech" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ShipmentContactMech" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -1474,7 +1474,7 @@
                 <call-service service-name="createShipment" in-map-name="shipmentContext">
                     <result-to-field result-name="shipmentId" field-name="shipmentLookupMap.shipmentId"/>
                 </call-service>
-                <find-by-primary-key entity-name="Shipment" map-name="shipmentLookupMap" value-field="shipment"/>
+                <find-by-primary-key entity-name="Shipment" map="shipmentLookupMap" value-field="shipment"/>
 
                 <if><condition><if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/></condition>
                   <then>
@@ -1619,7 +1619,7 @@
         <if-not-empty field="parameters.serialNumber">                
         <make-value entity-name="OrderItemShipGrpInvRes" value-field="orderItemShipGrpInvResLookupPk"/>                
         <set-pk-fields value-name="orderItemShipGrpInvResLookupPk" map-name="parameters"/>
-        <find-by-primary-key entity-name="OrderItemShipGrpInvRes" map-name="orderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>      
+        <find-by-primary-key entity-name="OrderItemShipGrpInvRes" map="orderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>      
         <get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-name="orderItemShipGrpInvRes"/>        
         <if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">            
             <!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
@@ -1654,7 +1654,7 @@
         <log level="info" message="Package SeqID : ${shipItemContext.shipmentPackageSeqId}"/>
         <make-value entity-name="ShipmentPackage" value-field="shipmentPackageLookupPk"/>                
         <set-pk-fields value-name="shipmentPackageLookupPk" map-name="parameters"/>
-        <find-by-primary-key entity-name="ShipmentPackage" map-name="shipmentPackageLookupPk" value-field="shipmentPackage"/>
+        <find-by-primary-key entity-name="ShipmentPackage" map="shipmentPackageLookupPk" value-field="shipmentPackage"/>
         <if-empty field="shipmentPackage">
             <set from-field="itemIssuance.shipmentId" field="shipPackageContext.shipmentId"/>
             <set from-field="shipItemContext.shipmentPackageSeqId" field="shipPackageContext.shipmentPackageSeqId"/>  
@@ -1673,7 +1673,7 @@
             <set from-field="itemIssuance.shipmentId" field="routeSegLookup.shipmentId"/>
             <!-- quick ship orders should only have one route segment -->
             <set value="00001" field="routeSegLookup.shipmentRouteSegmentId"/>
-            <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="routeSegLookup" value-field="packageRouteSegment"/>
+            <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="routeSegLookup" value-field="packageRouteSegment"/>
             <if-not-empty field="packageRouteSegment">
                 <set from-field="parameters.trackingNum" field="packageRouteSegment.trackingCode"/>
                 <store-value value-name="packageRouteSegment"/>
@@ -1757,7 +1757,7 @@
         <call-service service-name="createShipment" in-map-name="shipmentContext">
             <result-to-field result-name="shipmentId" field-name="shipmentLookupMap.shipmentId"/>
         </call-service>
-        <find-by-primary-key entity-name="Shipment" map-name="shipmentLookupMap" value-field="shipment"/>
+        <find-by-primary-key entity-name="Shipment" map="shipmentLookupMap" value-field="shipment"/>
 
         <!-- issue the passed in order items -->
         <log level="verbose" message="ShipMap List : ${itemMapList}  /  ${parameters.itemShipList}"/>
@@ -1802,7 +1802,7 @@
                 <set from-field="itemIssuance.shipmentId" field="routeSegLookup.shipmentId"/>
                 <!-- quick ship orders should only have one route segment -->
                 <set value="00001" field="routeSegLookup.shipmentRouteSegmentId"/>
-                <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map-name="routeSegLookup" value-field="packageRouteSegment"/>
+                <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="routeSegLookup" value-field="packageRouteSegment"/>
 
                 <if-not-empty field="packageRouteSegment">
                     <set from-field="itemMap.trackingNum" field="packageRouteSegment.trackingCode"/>
@@ -1842,11 +1842,11 @@
         </check-permission>
         <make-value entity-name="OrderShipment" value-field="lookupPk"/>
         <set-pk-fields value-name="lookupPk" map-name="parameters"/>
-        <find-by-primary-key entity-name="OrderShipment" map-name="lookupPk" value-field="orderShipment"/>
+        <find-by-primary-key entity-name="OrderShipment" map="lookupPk" value-field="orderShipment"/>
         <clear-field field-name="lookupPk"/>
         <make-value entity-name="ShipmentItem" value-field="lookupPk"/>
         <set-pk-fields value-name="lookupPk" map-name="parameters"/>
-        <find-by-primary-key entity-name="ShipmentItem" map-name="lookupPk" value-field="shipmentItem"/>
+        <find-by-primary-key entity-name="ShipmentItem" map="lookupPk" value-field="shipmentItem"/>
 
         <set from-field="parameters.userLogin" field="inMap.userLogin"/>
         <set from-field="parameters.shipmentId" field="inMap.shipmentId"/>
@@ -1893,7 +1893,7 @@
             <!-- get orderHeader -->
             <make-value entity-name="OrderHeader" value-field="orderHeaderLookupPk"/>
             <set-pk-fields value-name="orderHeaderLookupPk" map-name="parameters"/>
-            <find-by-primary-key map-name="orderHeaderLookupPk" value-field="orderHeader"/>
+            <find-by-primary-key map="orderHeaderLookupPk" value-field="orderHeader"/>
 
             <!-- make sure the order is of orderTypeId: SALES_ORDER -->
             <if-compare field="orderHeader.orderTypeId" operator="not-equals" value="SALES_ORDER">
@@ -1903,7 +1903,7 @@
             <!-- get orderItem -->
             <make-value entity-name="OrderItem" value-field="orderItemLookupPk"/>
             <set-pk-fields value-name="orderItemLookupPk" map-name="parameters"/>
-            <find-by-primary-key map-name="orderItemLookupPk" value-field="orderItem"/>
+            <find-by-primary-key map="orderItemLookupPk" value-field="orderItem"/>
 
             <!-- make sure the orderItem is not already present in this shipment -->
             <make-value entity-name="OrderShipment" value-field="orderShipmentLookup"/>
@@ -1945,7 +1945,7 @@
         <!-- get orderItem -->
         <make-value entity-name="OrderItem" value-field="orderItemLookupPk"/>
         <set-pk-fields value-name="orderItemLookupPk" map-name="parameters"/>
-        <find-by-primary-key map-name="orderItemLookupPk" value-field="orderItem"/>
+        <find-by-primary-key map="orderItemLookupPk" value-field="orderItem"/>
 
         <set from-field="parameters.orderId" field="orderShipmentLookup.orderId"/>
         <set from-field="parameters.orderItemSeqId" field="orderShipmentLookup.orderItemSeqId"/>

Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml Tue Dec 30 03:51:58 2008
@@ -37,7 +37,7 @@
 
         <make-value entity-name="SecurityGroup" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="SecurityGroup" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="SecurityGroup" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -59,7 +59,7 @@
 
         <make-value entity-name="SecurityPermission" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="SecurityPermission" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="SecurityPermission" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -83,7 +83,7 @@
 
         <make-value entity-name="SecurityGroupPermission" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="SecurityGroupPermission" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="SecurityGroupPermission" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
         
         <!-- clear the org.ofbiz.security.Security object's custom cache by lookupPKMap -->
@@ -115,7 +115,7 @@
 
         <make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="UserLoginSecurityGroup" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="UserLoginSecurityGroup" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
         
@@ -128,7 +128,7 @@
 
         <make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="UserLoginSecurityGroup" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="UserLoginSecurityGroup" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
         
         <!-- clear the org.ofbiz.security.Security object's custom cache by userLoginId -->
@@ -154,7 +154,7 @@
         <check-errors/>
         <make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProtectedView" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProtectedView" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
         
@@ -167,7 +167,7 @@
         
         <make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="ProtectedView" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="ProtectedView" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
         
         <!-- clear the org.ofbiz.security.Security object's custom cache by lookupPKMap -->

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml Tue Dec 30 03:51:58 2008
@@ -164,7 +164,7 @@
 
                         <!-- recurse through all parents -->
                         <set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
-                        <find-by-primary-key entity-name="WorkEffort" map-name="workEffortLookUpMap" value-field="workEffortParent"/>
+                        <find-by-primary-key entity-name="WorkEffort" map="workEffortLookUpMap" value-field="workEffortParent"/>
                         <set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
                         <if-empty field="workEffortParent.workEffortParentId">
                             <clear-field field-name="workEffortId"/>
@@ -205,7 +205,7 @@
 
                         <!-- recurse through all parents -->
                         <set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
-                        <find-by-primary-key entity-name="WorkEffort" map-name="workEffortLookUpMap" value-field="workEffortParent"/>
+                        <find-by-primary-key entity-name="WorkEffort" map="workEffortLookUpMap" value-field="workEffortParent"/>
                         <set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
                         <if-empty field="workEffortParent.workEffortParentId">
                             <clear-field field-name="workEffortId"/>
@@ -292,7 +292,7 @@
                     <field-to-result field-name="failMessage"/>
                     <!-- recurse through all parents -->
                     <set field="workEffortLookUpMap.workEffortId" from-field="workEffortId"/>
-                    <find-by-primary-key entity-name="WorkEffort" map-name="workEffortLookUpMap" value-field="workEffortParent"/>
+                    <find-by-primary-key entity-name="WorkEffort" map="workEffortLookUpMap" value-field="workEffortParent"/>
                     <set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
                     <if-empty field="workEffortParent.workEffortParentId">
                         <clear-field field-name="workEffortId"/>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Dec 30 03:51:58 2008
@@ -200,7 +200,7 @@
     <simple-method method-name="makeCommunicationEventWorkEffort" short-description="Make a Communication Event WorkEffort">
         <make-value entity-name="CommunicationEventWorkEff" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="lookupMap" value-field="eventWe"/>
+        <find-by-primary-key entity-name="CommunicationEventWorkEff" map="lookupMap" value-field="eventWe"/>
         <if-not-empty field="eventWe.workEffortId">
             <set-nonpk-fields map-name="parameters" value-name="eventWe"/>
             <set field="eventWe.description" from-field="parameters.relationDescription"/>
@@ -221,7 +221,7 @@
         <!-- Find old value -->
         <make-value entity-name="CommunicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <set-pk-fields value-name="communicationEventWorkEff" map-name="parameters"/>
-        <find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="communicationEventWorkEff" value-field="communicationEventWorkEff"/>
+        <find-by-primary-key entity-name="CommunicationEventWorkEff" map="communicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <if-empty field="communicationEventWorkEff">
             <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
         </if-empty>
@@ -236,7 +236,7 @@
         <!-- Find old value -->
         <make-value entity-name="CommunicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <set-pk-fields value-name="communicationEventWorkEff" map-name="parameters"/>
-        <find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="communicationEventWorkEff" value-field="communicationEventWorkEff"/>
+        <find-by-primary-key entity-name="CommunicationEventWorkEff" map="communicationEventWorkEff" value-field="communicationEventWorkEff"/>
         <if-empty field="communicationEventWorkEff">
             <add-error><fail-message message="ERROR: Cannot delete specified contact info because it does not correspond to the specified work effort"/></add-error>
         </if-empty>
@@ -693,7 +693,7 @@
     <simple-method method-name="createWorkEffortRequest" short-description="Create a CustRequestWorkEffort">
         <make-value entity-name="CustRequestWorkEffort" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="CustRequestWorkEffort" map-name="lookupMap" value-field="custRequestWorkEffort"/>
+        <find-by-primary-key entity-name="CustRequestWorkEffort" map="lookupMap" value-field="custRequestWorkEffort"/>
         <if-not-empty field="custRequestWorkEffort">
             <add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
@@ -715,7 +715,7 @@
     <simple-method method-name="createWorkEffortRequestItem" short-description="Create a CustRequestItemWorkEffort">
         <make-value entity-name="CustRequestItemWorkEffort" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-field="custRequestItemWorkEffort"/>
+        <find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap" value-field="custRequestItemWorkEffort"/>
         <if-not-empty field="custRequestItemWorkEffort">
             <add-error><fail-message message="ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
@@ -734,7 +734,7 @@
     <simple-method method-name="checkCustRequestItemExists" short-description="Checks to see if a CustRequestItem exists">
         <make-value entity-name="CustRequestItem" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="CustRequestItem" map-name="lookupMap" value-field="custRequestItem"/>
+        <find-by-primary-key entity-name="CustRequestItem" map="lookupMap" value-field="custRequestItem"/>
         <if-not-empty field="custRequestItem">
             <set field="custRequestItemExists" value="true"/>
             <field-to-result field-name="custRequestItemExists"/>
@@ -749,7 +749,7 @@
     <simple-method method-name="createWorkEffortQuote" short-description="Create a QuoteWorkEffort">
         <make-value entity-name="QuoteWorkEffort" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-field="quoteWorkEffort"/>
+        <find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap" value-field="quoteWorkEffort"/>
         <if-not-empty field="quoteWorkEffort">
             <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
@@ -771,7 +771,7 @@
     <simple-method method-name="createWorkRequirementFulfillment" short-description="Create a WorkRequirementFulfillment">
         <make-value entity-name="WorkRequirementFulfillment" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="WorkRequirementFulfillment" map-name="lookupMap" value-field="workRequirementFulfillment"/>
+        <find-by-primary-key entity-name="WorkRequirementFulfillment" map="lookupMap" value-field="workRequirementFulfillment"/>
         <if-not-empty field="workRequirementFulfillment">
             <add-error><fail-message message="ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
@@ -793,7 +793,7 @@
     <simple-method method-name="createShoppingListWorkEffort" short-description="Create a ShoppingListWorkEffort">
         <make-value entity-name="ShoppingListWorkEffort" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="ShoppingListWorkEffort" map-name="lookupMap" value-field="shoppingListWorkEffort"/>
+        <find-by-primary-key entity-name="ShoppingListWorkEffort" map="lookupMap" value-field="shoppingListWorkEffort"/>
         <if-not-empty field="shoppingListWorkEffort">
             <add-error><fail-message message="ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
@@ -815,7 +815,7 @@
     <simple-method method-name="createOrderHeaderWorkEffort" short-description="Create a OrderHeaderWorkEffort">
         <make-value entity-name="OrderHeaderWorkEffort" value-field="lookupMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupMap"/>
-        <find-by-primary-key entity-name="OrderHeaderWorkEffort" map-name="lookupMap" value-field="orderWorkEffort"/>
+        <find-by-primary-key entity-name="OrderHeaderWorkEffort" map="lookupMap" value-field="orderWorkEffort"/>
         <if-not-empty field="orderWorkEffort">
             <add-error><fail-message message="ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
@@ -1033,7 +1033,7 @@
         <set from-field="parameters.workEffort" field="workEffort"/>
         <if-empty field="workEffort">
             <set from-field="parameters.workEffortId" field="findWorkEffortMap.workEffortId"/>
-            <find-by-primary-key entity-name="WorkEffort" map-name="findWorkEffortMap" value-field="workEffort"/>
+            <find-by-primary-key entity-name="WorkEffort" map="findWorkEffortMap" value-field="workEffort"/>
         </if-empty>
         <check-errors />
         <!-- index keywords -->
@@ -1083,7 +1083,7 @@
         </check-permission>
         <check-errors />
         <set from-field="parameters.workEffortId" field="findWorkEffortMap.workEffortId"/>
-        <find-by-primary-key entity-name="WorkEffort" map-name="findWorkEffortMap" value-field="workEffortInstance"/>
+        <find-by-primary-key entity-name="WorkEffort" map="findWorkEffortMap" value-field="workEffortInstance"/>
         <call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortKeywordIndex" method-name="indexKeywords">
             <field field-name="workEffortInstance" type="org.ofbiz.entity.GenericValue"/>
         </call-class-method>
@@ -1096,7 +1096,7 @@
         </check-permission>
         <check-errors />
         <set from-field="parameters.workEffortId" field="findWorkEffortMap.workEffortId"/>
-        <find-by-primary-key entity-name="WorkEffort" map-name="findWorkEffortMap" value-field="workEffortInstance"/>
+        <find-by-primary-key entity-name="WorkEffort" map="findWorkEffortMap" value-field="workEffortInstance"/>
         <if-not-empty field="workEffortInstance.workEffortId">            
         <remove-related relation-name="WorkEffortKeyword" value-name="workEffortInstance"></remove-related>            
         </if-not-empty>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml Tue Dec 30 03:51:58 2008
@@ -31,14 +31,14 @@
     <simple-method method-name="updateDataSource" short-description="Update an DataSource">
         <make-value entity-name="DataSource" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="DataSource" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="DataSource" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteDataSource" short-description="Delete an DataSource">
         <make-value entity-name="DataSource" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="DataSource" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="DataSource" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml Tue Dec 30 03:51:58 2008
@@ -30,14 +30,14 @@
     <simple-method method-name="updateDataSourceType" short-description="Update an DataSourceType">
         <make-value entity-name="DataSourceType" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="DataSourceType" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="DataSourceType" map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteDataSourceType" short-description="Delete an DataSourceType">
         <make-value entity-name="DataSourceType" value-field="lookupPKMap"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key entity-name="DataSourceType" map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key entity-name="DataSourceType" map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Tue Dec 30 03:51:58 2008
@@ -40,7 +40,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -50,7 +50,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 

Modified: ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml (original)
+++ ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml Tue Dec 30 03:51:58 2008
@@ -38,7 +38,7 @@
         <check-errors/>
 
         <set field="lookupPKMap.entitySyncId" from-field="parameters.entitySyncId"/>
-        <find-by-primary-key entity-name="EntitySync" map-name="lookupPKMap" value-field="valueToStore"/>
+        <find-by-primary-key entity-name="EntitySync" map="lookupPKMap" value-field="valueToStore"/>
         <set-nonpk-fields map-name="parameters" value-name="valueToStore"/>
         <store-value value-name="valueToStore"/>
     </simple-method>
@@ -48,7 +48,7 @@
 
         <!-- TODO: add some code to make sure, as much as possible, that this really isn't running -->
         <set field="lookupPKMap.entitySyncId" from-field="parameters.entitySyncId"/>        
-        <find-by-primary-key entity-name="EntitySync" map-name="lookupPKMap" value-field="valueToStore"/>
+        <find-by-primary-key entity-name="EntitySync" map="lookupPKMap" value-field="valueToStore"/>
         <if-compare field="valueToStore.runStatusId" operator="equals" value="ESR_RUNNING">
             <set field="valueToStore.runStatusId" value="ESR_NOT_STARTED"/>
             <store-value value-name="valueToStore"/>
@@ -78,7 +78,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="EntitySyncHistory"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -88,7 +88,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="EntitySyncHistory"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -108,7 +108,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="EntitySyncInclude"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -118,7 +118,7 @@
 
         <make-value value-field="lookupPKMap" entity-name="EntitySyncInclude"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
-        <find-by-primary-key map-name="lookupPKMap" value-field="lookedUpValue"/>
+        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Tue Dec 30 03:51:58 2008
@@ -30,7 +30,7 @@
         </call-service>
         <check-errors/>
         <set from-field="parameters.fixedAssetId" field="findAssetMaintLookup.fixedAssetId"/>
-        <find-by-primary-key entity-name="FixedAssetMaint" map-name="findAssetMaintLookup" value-field="findAssetMaint"/>
+        <find-by-primary-key entity-name="FixedAssetMaint" map="findAssetMaintLookup" value-field="findAssetMaint"/>
         <set from-field="findAssetMaint.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/>
         <set-service-fields map-name="parameters" service-name="updateWorkEffort" to-map-name="updateWorkEffortCtx"/>
         <!-- Maintenance WorkEffort entity -->

Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Tue Dec 30 03:51:58 2008
@@ -23,7 +23,7 @@
 
     <simple-method method-name="tc_ProductExists" short-description="Check Product Exists" login-required="false">
         <set from-field="parameters.productId" field="productIdMap.productId"/>
-        <find-by-primary-key entity-name="Product" map-name="productIdMap" value-field="product"/>      
+        <find-by-primary-key entity-name="Product" map="productIdMap" value-field="product"/>      
         <if-not-empty field="product.productId">
             <log level="info" message="Found product ID ${parameters.productId}, "/>
             <!-- <log level="info"><string value="Product Details are: "/><field field-name="product"/></log> -->

Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 03:51:58 2008
@@ -196,7 +196,7 @@
         
         <!-- Get mime type from FileExtention -->
         <set field="fileMap.fileExtensionId" value="${parameters.mimeType}"/>
-        <find-by-primary-key map-name="fileMap" value-field="mimeType" entity-name="FileExtension"/>        
+        <find-by-primary-key map="fileMap" value-field="mimeType" entity-name="FileExtension"/>        
         
         <!-- Create Data Resource -->
         <set-service-fields service-name="createContentFromUploadedFile" map-name="formInput.formInput" to-map-name="data"/>

Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 03:51:58 2008
@@ -204,7 +204,7 @@
 
         <!-- Get mime type from FileExtention -->
         <set field="fileMap.fileExtensionId" value="${parameters.mimeType}"/>
-        <find-by-primary-key map-name="fileMap" value-field="mimeType" entity-name="FileExtension"/>
+        <find-by-primary-key map="fileMap" value-field="mimeType" entity-name="FileExtension"/>
 
         <!-- Create Data Resource -->
         <set-service-fields service-name="createContentFromUploadedFile"

Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=730101&r1=730100&r2=730101&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Tue Dec 30 03:51:58 2008
@@ -26,7 +26,7 @@
         <set-pk-fields  map-name="parameters" value-name="newEntity" />
         
         <!-- make sure it doesn't already exist: motivation: if it already exists we'll get a HUGE error message on the create with the whole XML file in it if debug is on for that, so we want a smaller error message -->
-        <find-by-primary-key map-name="newEntity" value-field="currentOagisMessageInfo"/>
+        <find-by-primary-key map="newEntity" value-field="currentOagisMessageInfo"/>
         <if-not-empty field="currentOagisMessageInfo">
             <add-error><fail-message message="This message was already received, ie we have a duplicate combined ID for the message: ${newEntity}"/></add-error>
             <check-errors/>