You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 14:07:59 UTC

svn commit: r730124 [1/2] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accounting/script/org/ofbiz/accounting/payment/ applications/accoun...

Author: jleroux
Date: Tue Dec 30 05:07:57 2008
New Revision: 730124

URL: http://svn.apache.org/viewvc?rev=730124&view=rev
Log:
<set-service-fields(.*)\R(.*)map-name => <set-service-fields$2\R$2map-name (needs 2 occurences)

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
    ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
    ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
    ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
    ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
    ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
    ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
    ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml Tue Dec 30 05:07:57 2008
@@ -70,7 +70,7 @@
         <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
         <check-errors/>
         <set-service-fields service-name="createAgreement" to-map="createAgreementInMap" map="agreement"/>
-        <call-service service-name="createAgreement" in-map-name="createAgreementInMap">
+        <call-service service-name="createAgreement" in-map="createAgreementInMap">
             <result-to-field result-name="agreementId" field-name="agreementIdTo"/>
         </call-service>
 

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 30 05:07:57 2008
@@ -81,7 +81,7 @@
         <field-to-result field="finAccountId" map-name="newEntity" result-name="finAccountId"/>
         
         <set-service-fields service-name="createFinAccountStatus" map="newEntity" to-map="createFinAccountStatusMap"/>
-        <call-service service-name="createFinAccountStatus" in-map-name="createFinAccountStatusMap"/>
+        <call-service service-name="createFinAccountStatus" in-map="createFinAccountStatusMap"/>
     </simple-method>
     <simple-method method-name="updateFinAccount" short-description="Update a Financial Account">
         <call-simple-method method-name="getArithmeticSettingsInline"/>
@@ -116,7 +116,7 @@
                 
                 <!-- before we set the nonpk fields, if the statusId is different save a status history record -->
                 <set-service-fields service-name="createFinAccountStatus" map="parameters" to-map="createFinAccountStatusMap"/>
-                <call-service service-name="createFinAccountStatus" in-map-name="createFinAccountStatusMap"/>
+                <call-service service-name="createFinAccountStatus" in-map="createFinAccountStatusMap"/>
             </then>
         </if>
 

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 05:07:57 2008
@@ -120,7 +120,7 @@
         <if-not-empty field="parameters.statusId">
             <if-compare-field field="parameters.statusId" to-field="statusIdSave" operator="not-equals">
                 <set-service-fields service-name="setPaymentStatus" map="parameters" to-map="param"/>
-                <call-service service-name="setPaymentStatus" in-map-name="param"/>
+                <call-service service-name="setPaymentStatus" in-map="param"/>
                 <check-errors/>
             </if-compare-field>
         </if-not-empty>
@@ -228,7 +228,7 @@
 
     <simple-method method-name="createPaymentAndApplication" short-description="Create a payment and a payment application for the full amount">
         <set-service-fields service-name="createPayment" map="parameters" to-map="createPaymentInMap"/>
-        <call-service service-name="createPayment" in-map-name="createPaymentInMap">
+        <call-service service-name="createPayment" in-map="createPaymentInMap">
             <result-to-field field-name="paymentId" result-name="paymentId"/>
         </call-service>
         <check-errors/>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 30 05:07:57 2008
@@ -58,7 +58,7 @@
             <first-from-list entry="rateAmount" list="rateAmounts"/>
             <if-compare-field field="rateAmount.rateAmount" operator="not-equals" to-field="parameters.rateAmount">
                 <set-service-fields service-name="deleteRateAmount" map="rateAmount" to-map="delRateAmount"/>
-                <call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/>
+                <call-service service-name="deleteRateAmount" in-map="delRateAmount"/>
             </if-compare-field>
         </if-not-empty>
 
@@ -316,7 +316,7 @@
         
         <if-not-empty field="parameters.rateAmount">
             <set-service-fields service-name="updateRateAmount" map="parameters" to-map="updRate"/>
-            <call-service service-name="updateRateAmount" in-map-name="updRate"/>
+            <call-service service-name="updateRateAmount" in-map="updRate"/>
         </if-not-empty>
     </simple-method>
 

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Tue Dec 30 05:07:57 2008
@@ -246,6 +246,6 @@
             parameters.put("taxAuthGeoId", taxAuthPartyGeoIds.substring(taxAuthPartyGeoIds.indexOf("::") + 2));
         ]]></call-bsh>
         <set-service-fields service-name="createPartyTaxAuthInfo" map="parameters" to-map="createPartyTaxAuthInfoMap"/>
-        <call-service service-name="createPartyTaxAuthInfo" in-map-name="createPartyTaxAuthInfoMap" include-user-login="true"/>
+        <call-service service-name="createPartyTaxAuthInfo" in-map="createPartyTaxAuthInfoMap" include-user-login="true"/>
     </simple-method>   
 </simple-methods>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 05:07:57 2008
@@ -137,12 +137,12 @@
 
     <simple-method method-name="copyContentAndElectronicTextandAssoc" short-description="copy a content, electronic text and assocs and set status in progress">                
         <set-service-fields service-name="getContent" map="parameters" to-map="getC"/>
-        <call-service service-name="getContent" in-map-name="getC">
+        <call-service service-name="getContent" in-map="getC">
             <result-to-field result-name="view" field-name="content"/>
         </call-service>
         <if-not-empty field="content.dataResourceId">
             <set-service-fields service-name="getElectronicText" map="content" to-map="getEt"/>
-            <call-service service-name="getElectronicText" in-map-name="getEt">
+            <call-service service-name="getElectronicText" in-map="getEt">
                 <result-to-field result-name="textData" field-name="et.textData"/>
             </call-service>
             <set field="dataResource.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
@@ -158,7 +158,7 @@
         <clear-field field="content.contentId"/><!-- force new value -->        
         <clear-field field="content.statusId"/><!-- force new value -->
         <set-service-fields service-name="createContent" map="content" to-map="createContent"/>
-        <call-service service-name="createContent" in-map-name="createContent">
+        <call-service service-name="createContent" in-map="createContent">
             <result-to-field result-name="contentId" field-name="newContentId"/>
         </call-service>
         
@@ -168,7 +168,7 @@
         <iterate entry="assoc" list="assocs">
             <set field="assoc.contentId" from-field="newContentId"/>
             <set-service-fields service-name="createContentAssoc" map="assoc" to-map="assocS"/>
-            <call-service service-name="createContentAssoc" in-map-name="assocS"/>
+            <call-service service-name="createContentAssoc" in-map="assocS"/>
         </iterate>
 
         <entity-and entity-name="ContentAssoc" list="assocsTo">
@@ -177,7 +177,7 @@
         <iterate entry="assocTo" list="assocsTo">
             <set field="assocTo.contentIdTo" from-field="newContentId"/>
             <set-service-fields service-name="createContentAssoc" map="assocTo" to-map="assocTos"/>
-            <call-service service-name="createContentAssoc" in-map-name="assocTos"/>
+            <call-service service-name="createContentAssoc" in-map="assocTos"/>
         </iterate>
         
         <field-to-result field="newContentId" result-name="contentId"/>
@@ -536,7 +536,7 @@
     <!-- combined text + uploaded file service -->
     <simple-method method-name="createTextAndUploadedContent" short-description="Creates Text and Optionally Uploaded (sub) Content records">
         <set-service-fields service-name="createTextContent" map="parameters" to-map="textContext"/>
-        <call-service service-name="createTextContent" in-map-name="textContext">
+        <call-service service-name="createTextContent" in-map="textContext">
             <result-to-field result-name="contentId" field-name="parentContentId" map-name="parameters"/>
         </call-service>
 
@@ -820,7 +820,7 @@
         <check-errors/>
 			-->
 		<set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/>
-		<call-service service-name="persistContentAndAssoc" in-map-name="persistIn">
+		<call-service service-name="persistContentAndAssoc" in-map="persistIn">
 			<results-to-map map-name="persistOut"/>
 		</call-service>
 
@@ -879,7 +879,7 @@
 
     <simple-method method-name="createContentAndAssoc" short-description="Create content and associate with other content">
         <set-service-fields service-name="createContent" map="parameters" to-map="contentData"/>
-        <call-service service-name="createContent" in-map-name="contentData">
+        <call-service service-name="createContent" in-map="contentData">
             <result-to-field result-name="contentId" field-name="newContentId"/>
         </call-service>
         <if-not-empty field="newContentId">
@@ -1196,7 +1196,7 @@
     <simple-method method-name="getSubSubContentWithPermCheck" short-description="Get sub content and perform permission check on each record">
     
         <set-service-fields service-name="getSubContentWithPermCheck" map="parameters" to-map="inMap"/>
-        <call-service service-name="getSubContentWithPermCheck" in-map-name="inMap">
+        <call-service service-name="getSubContentWithPermCheck" in-map="inMap">
             <result-to-field result-name="subContentList"/>
         </call-service>        
         

Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Dec 30 05:07:57 2008
@@ -997,7 +997,7 @@
                     processor-name="updatePassword" in-map-name="parameters" out-map-name="passwordMap"/>
                 <check-errors/>
                 <set-service-fields service-name="updatePassword" map="passwordMap" to-map="passwordCtx"/>
-                <call-service service-name="updatePassword" in-map-name="passwordCtx">
+                <call-service service-name="updatePassword" in-map="passwordCtx">
                     <result-to-field result-name="updatedUserLogin"/>
                 </call-service>
                 <set-current-user-login value-name="updatedUserLogin"/>
@@ -1250,7 +1250,7 @@
 
         <!-- create person -->
         <set-service-fields service-name="createPerson" map="personCtx" to-map="createPersonCtx"/>
-        <call-service service-name="createPerson" in-map-name="createPersonCtx">
+        <call-service service-name="createPerson" in-map="createPersonCtx">
             <result-to-field result-name="partyId" field-name="partyId"/>
         </call-service>
         <set field="parameters.partyId" from-field="partyId"/>

Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 05:07:57 2008
@@ -198,7 +198,7 @@
         <create-value value-field="newEntity"/>
         
         <set-service-fields service-name="createPayHistory" map="newEntity" to-map="createPayHistoryMap"/>
-        <call-service service-name="createPayHistory" in-map-name="createPayHistoryMap"/>
+        <call-service service-name="createPayHistory" in-map="createPayHistoryMap"/>
     </simple-method>
     
     <simple-method method-name="updateEmployment" short-description="Update Employment">
@@ -626,7 +626,7 @@
         
         <if-not-empty field="parameters.rateAmount">
             <set-service-fields service-name="updateRateAmount" map="parameters" to-map="updRate"/>
-            <call-service service-name="updateRateAmount" in-map-name="updRate"/>
+            <call-service service-name="updateRateAmount" in-map="updRate"/>
         </if-not-empty>
     </simple-method>
     

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 05:07:57 2008
@@ -112,7 +112,7 @@
         <create-value value-field="newEntity"/>
         
         <set-service-fields service-name="createContactListPartyStatus" map="newEntity" to-map="createContactListPartyStatusMap"/>
-        <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/>
+        <call-service service-name="createContactListPartyStatus" in-map="createContactListPartyStatusMap"/>
     </simple-method>
     <simple-method method-name="updateContactListParty" short-description="Update Add Party To ContactList">
         <!-- allow if userLogin.partyId = parameters.partyId or has permission -->
@@ -136,7 +136,7 @@
             <if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
                 <!-- NOTE: must be parameters as this will have the new statusId, and it will have additional attributes like optInVerifyCode -->
                 <set-service-fields service-name="createContactListPartyStatus" map="parameters" to-map="createContactListPartyStatusMap"/>
-                <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/>
+                <call-service service-name="createContactListPartyStatus" in-map="createContactListPartyStatusMap"/>
             </if-compare-field>
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 05:07:57 2008
@@ -132,7 +132,7 @@
 
         <if-not-empty field="partyRelationship">
             <set-service-fields service-name="updatePartyRelationship" map="partyRelationship" to-map="deletePartyRelationship"/>
-            <call-service service-name="deletePartyRelationship" in-map-name="deletePartyRelationship"/>
+            <call-service service-name="deletePartyRelationship" in-map="deletePartyRelationship"/>
             <set field="partyGroupId" from-field="partyRelationship.partyIdFrom"/>
             <else>
                 <set field="partyGroupId" from-field="parameters.partyGroupId"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 05:07:57 2008
@@ -845,7 +845,7 @@
     <simple-method method-name="createReturnAndItemOrAdjustment" short-description="If returnId is null, create a return; then create Return Item or Adjustment based on the parameters passed in">
         <if-empty field="parameters.returnId">
             <set-service-fields service-name="createReturnHeader" map="parameters" to-map="returnHeaderInMap"/>
-            <call-service service-name="createReturnHeader" in-map-name="returnHeaderInMap">
+            <call-service service-name="createReturnHeader" in-map="returnHeaderInMap">
                 <result-to-field result-name="returnId" field-name="returnId"/>
             </call-service>
             <check-errors/>
@@ -853,7 +853,7 @@
             <field-to-result field="returnId" result-name="returnId"/>
         </if-empty>
         <set-service-fields service-name="createReturnItemOrAdjustment" map="parameters" to-map="createReturnItemOrAdjustmentInMap"/>
-        <call-service service-name="createReturnItemOrAdjustment" in-map-name="createReturnItemOrAdjustmentInMap">
+        <call-service service-name="createReturnItemOrAdjustment" in-map="createReturnItemOrAdjustmentInMap">
             <result-to-field result-name="returnAdjustmentId" field-name="returnAdjustmentId"/>
             <result-to-field result-name="returnItemSeqId" field-name="returnItemSeqId"/>
         </call-service>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 05:07:57 2008
@@ -152,7 +152,7 @@
 
         <!-- create the OrderRequirementCommitment to record the Requirement created for an order item -->
         <set-service-fields to-map="orderReqCommitParams" service-name="createOrderRequirementCommitment" map="parameters"/>
-        <call-service service-name="createOrderRequirementCommitment" in-map-name="orderReqCommitParams"/>
+        <call-service service-name="createOrderRequirementCommitment" in-map="orderReqCommitParams"/>
 
         <field-to-result field="parameters.requirementId" result-name="requirementId"/>
     </simple-method>
@@ -696,7 +696,7 @@
                  <set field="inputMap.shipmentMethod" value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId}"/>
                  <set field="inputMap.oldContactMechId" from-field="parameters.oldContactMechId"/>
                  <set-service-fields to-map="orderItemShipGroupMap" service-name="updateOrderItemShipGroup" map="inputMap"/>
-                 <call-service service-name="updateOrderItemShipGroup" in-map-name="orderItemShipGroupMap" include-user-login="true"/>
+                 <call-service service-name="updateOrderItemShipGroup" in-map="orderItemShipGroupMap" include-user-login="true"/>
               </iterate>
            </if-not-empty>
            </if-compare> 
@@ -705,12 +705,12 @@
         <!-- If orderContactMechList value is null then create new entry in OrderContactMech entity-->
         <if-empty field="orderContactMechList">
             <set-service-fields service-name="createOrderContactMech" map="parameters" to-map="createOrderContactMechMap"/>
-            <call-service service-name="createOrderContactMech" in-map-name="createOrderContactMechMap" include-user-login="true"/>
+            <call-service service-name="createOrderContactMech" in-map="createOrderContactMechMap" include-user-login="true"/>
             <set from-field="parameters.orderId" field="orderContactMechLookupMap.orderId"/>
             <set from-field="parameters.oldContactMechId" field="orderContactMechLookupMap.contactMechId"/>
             <set from-field="parameters.contactMechPurposeTypeId" field="orderContactMechLookupMap.contactMechPurposeTypeId"/>
             <set-service-fields service-name="removeOrderContactMech" map="orderContactMechLookupMap" to-map="removeOrderContactMechMap"/>
-            <call-service service-name="removeOrderContactMech" in-map-name="removeOrderContactMechMap" include-user-login="true"/>
+            <call-service service-name="removeOrderContactMech" in-map="removeOrderContactMechMap" include-user-login="true"/>
         </if-empty>    
         <store-value value-name="orderContactMechMap"/>
         </else>         
@@ -745,7 +745,7 @@
         <!-- If orderContactMechList value is null then create new entry in OrderContactMech entity-->
         <if-empty field="orderContactMechList">
             <set-service-fields service-name="createOrderContactMech" map="parameters" to-map="createOrderContactMechMap"/>
-            <call-service service-name="createOrderContactMech" in-map-name="createOrderContactMechMap" include-user-login="true"/>
+            <call-service service-name="createOrderContactMech" in-map="createOrderContactMechMap" include-user-login="true"/>
         </if-empty>    
         <store-value value-name="lookedUpValue"/>
         <!-- Remove the old values from OrderContactMech entity with the help of oldContactMechId -->
@@ -758,7 +758,7 @@
             <set from-field="parameters.oldContactMechId" field="inputMap.contactMechId"/>
             <find-by-and entity-name="OrderContactMech" map-name="inputMap" list-name="orderContactMechList"/>
             <set-service-fields service-name="createOrderContactMech" map="inputMap" to-map="removeOrderContactMechMap"/>
-            <call-service service-name="removeOrderContactMech" in-map-name="removeOrderContactMechMap" include-user-login="true"/>
+            <call-service service-name="removeOrderContactMech" in-map="removeOrderContactMechMap" include-user-login="true"/>
         </if-empty>
     </simple-method>
 
@@ -939,7 +939,7 @@
                     <if-not-empty field="pcmpList">
                         <first-from-list list="pcmpList" entry="pcmp"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                         <clear-field field="serviceInMap"/>
                     </if-not-empty>
                     <set field="serviceContext.partyId" from-field="userLogin.partyId"/>
@@ -972,7 +972,7 @@
                         <first-from-list list="pcmpList" entry="pcmp"/>
                         <if-not-empty field="pcmp">
                             <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                            <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                            <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                         </if-not-empty>
                         <set field="shipToAddressCtx.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
                         <call-service service-name="createPartyPostalAddress" in-map-name="shipToAddressCtx">
@@ -1020,11 +1020,11 @@
                     </entity-and>
                     <first-from-list entry="pcmp" list="pcmpList"/>
                     <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                    <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                    <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                     <clear-field field="serviceInMap"/>
                     <if-compare field="keepAddressBook" operator="equals" value="N">
                         <set-service-fields service-name="deletePartyContactMech" map="pcmp" to-map="serviceInMap"/>
-                        <call-service service-name="deletePartyContactMech" in-map-name="serviceInMap"/>
+                        <call-service service-name="deletePartyContactMech" in-map="serviceInMap"/>
                         <clear-field field="serviceInMap"/>
                     </if-compare>
                     <set field="billToAddressCtx.contactMechPurposeTypeId" value="BILLING_LOCATION"/>
@@ -1083,7 +1083,7 @@
                     <if-not-empty field="pcmpList">
                         <first-from-list list="pcmpList" entry="pcmp"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                         <clear-field field="serviceInMap"/>
                     </if-not-empty>
                     <set field="serviceContext.partyId" from-field="userLogin.partyId"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml Tue Dec 30 05:07:57 2008
@@ -57,7 +57,7 @@
                     <then>
                         <!-- Create new content from upload file -->
                         <set-service-fields service-name="createContentFromUploadedFile"
-                            map-name="formInput.formInput" to-map-name="inMap"/>
+                            map="formInput.formInput" to-map="inMap"/>
                         <set field="inMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
                         <set field="inMap.uploadedFile" from-field="formInput.imageData"/>
                         <set field="inMap._uploadedFile_contentType" from-field="formInput.uploadMimeType"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 05:07:57 2008
@@ -93,7 +93,7 @@
         
         <!-- save the created status in the history -->
         <set-service-fields to-map="statusMap" service-name="createCustRequestStatus" map="newEntity"/>
-        <call-service service-name="createCustRequestStatus" in-map-name="statusMap"/>
+        <call-service service-name="createCustRequestStatus" in-map="statusMap"/>
 
         <!-- This code is commented because the requester party is no more maintained in the CustRequestParty entity.
              There is now the fromPartyId field in the CustRequest entity for this. -->
@@ -171,7 +171,7 @@
             </if-compare>
             <!-- save the changed status in the history -->
             <set-service-fields to-map="statusMap" service-name="createCustRequestStatus" map="custRequest"/>
-            <call-service service-name="createCustRequestStatus" in-map-name="statusMap"/>
+            <call-service service-name="createCustRequestStatus" in-map="statusMap"/>
             <if-not-empty field="isShowEvent">
                 <clear-field field="successMessage"/>
             </if-not-empty>
@@ -440,7 +440,7 @@
             <result-to-field result-name="custRequestId" field-name="parameters.custRequestId"/>
         </call-service>
         <set-service-fields service-name="createCustRequestCommEvent" map="parameters" to-map="custRequestCommEvent"/>
-        <call-service service-name="createCustRequestCommEvent" in-map-name="custRequestCommEvent"/>
+        <call-service service-name="createCustRequestCommEvent" in-map="custRequestCommEvent"/>
 
         <if-empty field="parameters.content">
             <set field="parameters.content" from-field="communicationEvent.content"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 05:07:57 2008
@@ -150,7 +150,7 @@
         <if-compare field="parameters.quantity" operator="equals" value="0" type="Double">
           <!-- if we're setting quantity to 0.0 then remove the item -->
             <set-service-fields service-name="removeShoppingListItem" map="parameters" to-map="removeParams"/>
-            <call-service service-name="removeShoppingListItem" in-map-name="removeParams"/>
+            <call-service service-name="removeShoppingListItem" in-map="removeParams"/>
         <else>
           <!-- otherwise, just update shopping list item in place -->
             <set-nonpk-fields map="parameters" value-field="shoppingListItem"/>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 05:07:57 2008
@@ -304,7 +304,7 @@
                 </entity-and>
                 <if-empty field="roles">
                     <set-service-fields service-name="deleteCommunicationEvent" map="parameters" to-map="inMapDel"/>
-                    <call-service service-name="deleteCommunicationEvent" in-map-name="inMapDel"/>
+                    <call-service service-name="deleteCommunicationEvent" in-map="inMapDel"/>
                 </if-empty>
             </if-compare>
         </if-not-empty>        
@@ -358,7 +358,7 @@
         </entity-condition>
         <iterate entry="communicationEvent" list="communicationEvents">
             <set-service-fields service-name="sendCommEventAsEmail" map="communicationEvent" to-map="inMap"/>
-            <call-service service-name="sendCommEventAsEmail" in-map-name="inMap" require-new-transaction="true"/>
+            <call-service service-name="sendCommEventAsEmail" in-map="inMap" require-new-transaction="true"/>
         </iterate>
     </simple-method>
 
@@ -389,7 +389,7 @@
         <!-- create partyId if not provided -->
         <if-empty field="parameters.partyId">
             <set-service-fields service-name="createPerson" map="parameters" to-map="newParty"/>
-            <call-service service-name="createPerson" in-map-name="newParty">
+            <call-service service-name="createPerson" in-map="newParty">
                 <result-to-field result-name="partyId" field-name="parameters.partyId"/>
             </call-service>
         </if-empty>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 05:07:57 2008
@@ -51,7 +51,7 @@
         
         <if-empty field="parameters.contactMechId">
             <set-service-fields service-name="createContactMech" map="parameters" to-map="createContactMechMap"/>
-            <call-service service-name="createContactMech" in-map-name="createContactMechMap">
+            <call-service service-name="createContactMech" in-map="createContactMechMap">
                 <result-to-field result-name="contactMechId" map-name="newValue"/>
             </call-service>    
             <log level="info" message="ContactMech created"/>    
@@ -91,7 +91,7 @@
         <!-- If we already have a new contactMechId don't update ContactMech -->
         <if-empty field="parameters.newContactMechId">                
             <set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/>
-            <call-service service-name="updateContactMech" in-map-name="updateContactMechMap">
+            <call-service service-name="updateContactMech" in-map="updateContactMechMap">
                 <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
                 <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/>
             </call-service>
@@ -159,7 +159,7 @@
         </if-empty>        
 
         <set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/>
-        <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
+        <call-service in-map="createPostalAddressMap" service-name="createPostalAddress">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
             <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/>
         </call-service>
@@ -183,7 +183,7 @@
         </if-empty>
         
         <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
-        <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
+        <call-service in-map="updatePostalAddressMap" service-name="updatePostalAddress">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
             <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field-name="contactMechId" />             
         </call-service>
@@ -206,7 +206,7 @@
                 
         <log level="info" message="Creating telecom number"/>
         <set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/>           
-        <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
+        <call-service in-map="createTelecomNumberMap" service-name="createTelecomNumber">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
             <result-to-field result-name="contactMechId" map-name="newPartyContactMech"/>             
         </call-service>
@@ -230,7 +230,7 @@
         </if-empty>
         
         <set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>          
-        <call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap">
+        <call-service service-name="updateTelecomNumber" in-map="updateTelecomNumberMap">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
             <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field-name="contactMechId" />             
         </call-service>
@@ -343,7 +343,7 @@
                     <if-not-empty field="pcmpList">
                         <first-from-list entry="pcmp" list="pcmpList"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                         <clear-field field="serviceInMap"/>
                     </if-not-empty>
                     <set field="serviceContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
@@ -362,7 +362,7 @@
                     <if-not-empty field="pcmpList">
                         <first-from-list entry="pcmp" list="pcmpList"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                        <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                     </if-not-empty>
                     <set field="serviceContext.contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                     <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/>
@@ -396,7 +396,7 @@
                     </call-service>
                 <else>
                     <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
-                    <call-service service-name="updatePostalAddress" in-map-name="updatePostalAddressMap">
+                    <call-service service-name="updatePostalAddress" in-map="updatePostalAddressMap">
                         <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
                         <result-to-field result-name="contactMechId" field-name="parameters.newContactMechId"/>
                         <result-to-result result-name="contactMechId"/>
@@ -448,7 +448,7 @@
                         <if-not-empty field="pcmpList">
                             <first-from-list list="pcmpList" entry="pcmp"/>
                             <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                            <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                            <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                             <clear-field field="serviceInMap"/>
                         </if-not-empty>
                         <set field="serviceContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
@@ -480,7 +480,7 @@
                         <if-not-empty field="pcmpList">
                             <first-from-list list="pcmpList" entry="pcmp"/>
                             <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
-                            <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
+                            <call-service service-name="deletePartyContactMechPurposeIfExists" in-map="serviceInMap"/>
                         </if-not-empty>
                         <set field="serviceContext.contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                         <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/>
@@ -497,7 +497,7 @@
 
     <simple-method method-name="updateContactMechAndPurposes" short-description="Update postal address, telecom number and purposes">
         <set-service-fields service-name="updatePostalAddressAndPurposes" map="parameters" to-map="updatePostalAddressAndPurposesCtx"/>
-        <call-service service-name="updatePostalAddressAndPurposes" in-map-name="updatePostalAddressAndPurposesCtx"/>
+        <call-service service-name="updatePostalAddressAndPurposes" in-map="updatePostalAddressAndPurposesCtx"/>
 
         <if-not-empty field="parameters.phoneContactMechId">
             <set-service-fields service-name="updatePartyTelecomNumber" map="parameters" to-map="updatePartyTelecomNumberCtx"/>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -350,7 +350,7 @@
             <find-by-and entity-name="PartyRole" map-name="partyRole" list-name="pRoles"/>
             <if-empty field="pRoles">
                 <set-service-fields service-name="createPartyRole" map="contentRole" to-map="partyRole"/>
-                <call-service service-name="createPartyRole" in-map-name="partyRole" break-on-error="false" />    
+                <call-service service-name="createPartyRole" in-map="partyRole" break-on-error="false" />    
             </if-empty>
        </if-not-empty>       
        <if-not-empty field="parameters._uploadedFile_fileName">
@@ -945,13 +945,13 @@
     <simple-method method-name="createUpdateTelecomNumber" short-description="Create and update phone number" login-required="false">
         <if-empty field="parameters.contactMechId">
             <set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
-            <call-service service-name="createPartyTelecomNumber" in-map-name="phoneContext">
+            <call-service service-name="createPartyTelecomNumber" in-map="phoneContext">
                 <result-to-field result-name="contactMechId" field-name="contactMechId"/>
             </call-service>
             <log level="info" message="Phone Contact created phoneContactMechId is ${contactMechId}"/>
         <else>
             <set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
-            <call-service service-name="updatePartyTelecomNumber" in-map-name="phoneContext">
+            <call-service service-name="updatePartyTelecomNumber" in-map="phoneContext">
                 <result-to-field result-name="contactMechId" field-name="contactMechId"/>
             </call-service> 
             <log level="info" message="Phone Contact updated phoneContactMechId is ${contactMechId}"/>
@@ -970,7 +970,7 @@
             <log level="info" message="Email Contact Created emailContactMechId is ${contactMechId}"></log>
         <else>
             <set-service-fields service-name="updatePartyEmailAddress" map="parameters" to-map="emailAddressContext"/>
-            <call-service service-name="updatePartyEmailAddress" in-map-name="emailAddressContext">
+            <call-service service-name="updatePartyEmailAddress" in-map="emailAddressContext">
                 <result-to-field result-name="contactMechId" field-name="contactMechId"/>
             </call-service> 
             <log level="info" message="Email Contact updated emailContactMechId is ${contactMechId}"></log>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -397,7 +397,7 @@
         <set field="emailContext.partyId" from-field="partyId"/>
         <set field="emailContext.emailType" value="PARTY_REGIS_CONFIRM"/>
         <set-service-fields service-name="sendCreatePartyEmailNotification" map="emailContext" to-map="serviceInMap"/>
-        <call-service service-name="sendCreatePartyEmailNotification" in-map-name="serviceInMap"/>
+        <call-service service-name="sendCreatePartyEmailNotification" in-map="serviceInMap"/>
     </simple-method>
 
 </simple-methods>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -185,7 +185,7 @@
     <simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" login-required="false">                  
         <!-- Get all the categories from top category -->
         <set-service-fields to-map="categoryFindContext" service-name="getAllCategories" map="parameters"/>
-        <call-service service-name="getAllCategories" in-map-name="categoryFindContext">
+        <call-service service-name="getAllCategories" in-map="categoryFindContext">
             <result-to-field result-name="categories" field-name="categories"/>
         </call-service>
         <!-- Get the category from categories-->
@@ -206,7 +206,7 @@
     <simple-method method-name="checkImageUrlForCategoryAndProduct" short-description="Check for image url exists or not for category and product " login-required="false">                  
         <!--set from-field="parameters.categoryId" field="productCategoryContext.categoryId"/ -->        
         <set-service-fields to-map="productCategoryContext" service-name="getProductCategoryMembers" map="parameters"/>
-        <call-service service-name="getProductCategoryMembers" in-map-name="productCategoryContext" >
+        <call-service service-name="getProductCategoryMembers" in-map="productCategoryContext" >
             <result-to-field result-name="categoryMembers" field-name="categoryMembers"/>
             <result-to-field result-name="category" field-name="category"/>            
         </call-service>  

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -34,7 +34,7 @@
         <create-value value-field="newEntity"/>
 
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
-        <call-service service-name="updateContent" in-map-name="updateContent"/>
+        <call-service service-name="updateContent" in-map="updateContent"/>
 
         <field-to-result map-name="newEntity" field="contentId"/>
         <field-to-result map-name="newEntity" field="productCategoryId"/>
@@ -48,7 +48,7 @@
         <store-value value-name="lookedUpValue"/>
 
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
-        <call-service service-name="updateContent" in-map-name="updateContent"/>
+        <call-service service-name="updateContent" in-map="updateContent"/>
     </simple-method>
     <simple-method method-name="removeCategoryContent" short-description="Remove Content From Category">
         <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
@@ -59,15 +59,15 @@
     <simple-method method-name="createSimpleTextContentForCategory" short-description="Create Simple Text Content For Product Category">
         <set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContentMap"/>
         <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/>
-        <call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap">
+        <call-service service-name="createSimpleTextContent" in-map="createSimpleTextMap">
             <result-to-field result-name="contentId" map-name="createCategoryContentMap" />
         </call-service>
         <call-service service-name="createCategoryContent" in-map-name="createCategoryContentMap"/>
     </simple-method>
     <simple-method method-name="updateSimpleTextContentForCategory" short-description="Update Simple Text Content For Product Category">
         <set-service-fields service-name="updateCategoryContent" map="parameters" to-map="updateCategoryContent"/>
-        <call-service service-name="updateCategoryContent" in-map-name="updateCategoryContent"/>
+        <call-service service-name="updateCategoryContent" in-map="updateCategoryContent"/>
         <set-service-fields service-name="updateSimpleTextContent" map="parameters" to-map="updateSimpleText"/>
-        <call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
+        <call-service service-name="updateSimpleTextContent" in-map="updateSimpleText"/>
     </simple-method>
 </simple-methods>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -777,7 +777,7 @@
     <!-- a service verion of checkCategoryRelatedPermission, only with purchase/viewAllowPermReqd taken into account -->
     <simple-method method-name="checkCategoryPermissionWithViewPurchaseAllow" short-description="Check Product Category Permission With View and Purchase Allow">
         <set-service-fields service-name="productCategoryGenericPermission" map="parameters" to-map="productCategoryGenericPermissionMap"/>
-        <call-service service-name="productCategoryGenericPermission" in-map-name="productCategoryGenericPermissionMap">
+        <call-service service-name="productCategoryGenericPermission" in-map="productCategoryGenericPermissionMap">
             <results-to-map map-name="genericResult"/>
         </call-service>
         <if-compare field="genericResult.hasPermission" operator="equals" value="false" type="Boolean">

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -34,7 +34,7 @@
         <create-value value-field="newEntity"/>
 
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
-        <call-service service-name="updateContent" in-map-name="updateContent"/>
+        <call-service service-name="updateContent" in-map="updateContent"/>
 
         <field-to-result map-name="newEntity" field="contentId"/>
         <field-to-result map-name="newEntity" field="configItemId"/>
@@ -48,7 +48,7 @@
         <store-value value-name="lookedUpValue"/>
 
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
-        <call-service service-name="updateContent" in-map-name="updateContent"/>
+        <call-service service-name="updateContent" in-map="updateContent"/>
     </simple-method>
     <simple-method method-name="removeProductConfigItemContent" short-description="Remove Content From ProductConfigItem">
         <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
@@ -61,16 +61,16 @@
     <simple-method method-name="createSimpleTextContentForProductConfigItem" short-description="Create Simple Text Content For Product">
         <set-service-fields service-name="createProductConfigItemContent" map="parameters" to-map="createProductConfigItemContent"/>
         <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleText"/>
-        <call-service service-name="createSimpleTextContent" in-map-name="createSimpleText" break-on-error="true" >
+        <call-service service-name="createSimpleTextContent" in-map="createSimpleText" break-on-error="true" >
             <result-to-field result-name="contentId" map-name="createProductConfigItemContent" />
         </call-service>
         <call-service service-name="createProductConfigItemContent" in-map-name="createProductConfigItemContent"/>
     </simple-method>
     <simple-method method-name="updateSimpleTextContentForProductConfigItem" short-description="Update Simple Text Content For Product">
         <set-service-fields service-name="updateProductConfigItemContent" map="parameters" to-map="updateProductConfigItemContent"/>
-        <call-service service-name="updateProductConfigItemContent" in-map-name="updateProductConfigItemContent"/>
+        <call-service service-name="updateProductConfigItemContent" in-map="updateProductConfigItemContent"/>
         <set-service-fields service-name="updateSimpleTextContent" map="parameters" to-map="updateSimpleText"/>
-        <call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
+        <call-service service-name="updateSimpleTextContent" in-map="updateSimpleText"/>
     </simple-method>
 
 </simple-methods>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -198,7 +198,7 @@
                     <!-- change status on inventoryItem -->
                     <set field="inventoryItem.statusId" value="INV_DELIVERED" />
                     <set-service-fields service-name="updateInventoryItem"  map="inventoryItem" to-map="inventoryItemMap"/>
-                    <call-service service-name="updateInventoryItem" in-map-name="inventoryItemMap"/>
+                    <call-service service-name="updateInventoryItem" in-map="inventoryItemMap"/>
 
                     <!-- create ItemIssuance record -->
                     <set field="issuanceCreateMap.orderId" from-field="parameters.orderId"/>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -330,7 +330,7 @@
         <first-from-list entry="inventoryItemReservation" list="invReservations"/>
         <if-not-empty field="inventoryItemReservation"> 
             <set-service-fields map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
-            <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
+            <call-service service-name="cancelOrderItemShipGrpInvRes" in-map="cancelOrderItemShipGrpInvResMap"/>
             <!-- Hold our inventoryItem -->
             <refresh-value value-name="inventoryItem"/>
             <set value="INV_PROMISED" field="inventoryItem.statusId"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 05:07:57 2008
@@ -515,12 +515,12 @@
     </simple-method>
     <simple-method method-name="createPhysicalInventoryAndVariance" short-description="Create a PhysicalInventory and an InventoryItemVariance">
         <set-service-fields service-name="createPhysicalInventory" map="parameters" to-map="createPhysicalInventoryMap"/>
-        <call-service service-name="createPhysicalInventory" in-map-name="createPhysicalInventoryMap">
+        <call-service service-name="createPhysicalInventory" in-map="createPhysicalInventoryMap">
             <result-to-field result-name="physicalInventoryId" field-name="physicalInventoryId" map-name="parameters"/>
             <result-to-result result-name="physicalInventoryId" service-result-name="physicalInventoryId"/>
         </call-service>
         <set-service-fields service-name="createInventoryItemVariance" map="parameters" to-map="createInventoryItemVarianceMap"/>
-        <call-service service-name="createInventoryItemVariance" in-map-name="createInventoryItemVarianceMap"/>
+        <call-service service-name="createInventoryItemVariance" in-map="createInventoryItemVarianceMap"/>
     </simple-method>
 
     <!-- ProductFacility methods -->
@@ -794,7 +794,7 @@
         <!-- FIRST, cancel all the reservations -->
         <iterate list="allReservations" entry="oisgir">
             <set-service-fields service-name="cancelOrderItemShipGrpInvRes" to-map="cancelOisgirMap" map="oisgir"/>
-            <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOisgirMap"/>
+            <call-service service-name="cancelOrderItemShipGrpInvRes" in-map="cancelOisgirMap"/>
         </iterate>
 
         <!-- THEN, re-reserve the cancelled items -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 05:07:57 2008
@@ -394,7 +394,7 @@
                         <!-- now that targetInventoryItem is populated with quantities, etc, call createInventoryItem service -->
                         <clear-field field="createNonOisgirTargetDetailMap"/>
                         <set-service-fields map="targetInventoryItem" service-name="createInventoryItem" to-map="createInventoryItemMap"/>
-                        <call-service service-name="createInventoryItem" in-map-name="createInventoryItemMap">
+                        <call-service service-name="createInventoryItem" in-map="createInventoryItemMap">
                             <result-to-field result-name="inventoryItemId" field-name="createNonOisgirTargetDetailMap.inventoryItemId"/>
                         </call-service>
 
@@ -463,7 +463,7 @@
                 <set from-field="parameters.targetLocationSeqId" field="targetInventoryItem.locationSeqId"/>
                 <!-- now that targetInventoryItem is populated with initial values, call createInventoryItem service -->
                 <set-service-fields map="targetInventoryItem" service-name="createInventoryItem" to-map="createInventoryItemMap"/>
-                <call-service service-name="createInventoryItem" in-map-name="createInventoryItemMap">
+                <call-service service-name="createInventoryItem" in-map="createInventoryItemMap">
                     <result-to-field result-name="inventoryItemId" map-name="targetInventoryItem"/>
                 </call-service>
                 <!-- refresh the value object now that the create has been done -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml Tue Dec 30 05:07:57 2008
@@ -38,7 +38,7 @@
 
     <simple-method method-name="loadProductInProductDimension" short-description="">
         <set-service-fields service-name="prepareProductDimensionData" map="parameters" to-map="inMap"/>
-        <call-service service-name="prepareProductDimensionData" in-map-name="inMap">
+        <call-service service-name="prepareProductDimensionData" in-map="inMap">
             <result-to-field result-name="productDimension"/>
         </call-service>
         <clear-field field="inMap"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=730124&r1=730123&r2=730124&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Dec 30 05:07:57 2008
@@ -34,7 +34,7 @@
         <create-value value-field="newEntity"/>
 
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
-        <call-service service-name="updateContent" in-map-name="updateContent"/>
+        <call-service service-name="updateContent" in-map="updateContent"/>
 
         <field-to-result map-name="newEntity" field="contentId"/>
         <field-to-result map-name="newEntity" field="productId"/>
@@ -48,7 +48,7 @@
         <store-value value-name="lookedUpValue"/>
 
         <set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
-        <call-service service-name="updateContent" in-map-name="updateContent"/>
+        <call-service service-name="updateContent" in-map="updateContent"/>
     </simple-method>
     <simple-method method-name="removeProductContent" short-description="Remove Content From Product">
         <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
@@ -61,16 +61,16 @@
     <simple-method method-name="createEmailContentForProduct" short-description="Create Email Content For Product">
         <set-service-fields service-name="createProductContent" map="parameters" to-map="createProductContent"/>
         <set-service-fields service-name="createEmailContent" map="parameters" to-map="createEmail"/>
-        <call-service service-name="createEmailContent" in-map-name="createEmail" break-on-error="true" >
+        <call-service service-name="createEmailContent" in-map="createEmail" break-on-error="true" >
             <result-to-field result-name="contentId" map-name="createProductContent" />
         </call-service>
         <call-service service-name="createProductContent" in-map-name="createProductContent"/>
     </simple-method>
     <simple-method method-name="updateEmailContentForProduct" short-description="Update Email Content For Product">
         <set-service-fields service-name="updateProductContent" map="parameters" to-map="updateProductContent"/>
-        <call-service service-name="updateProductContent" in-map-name="updateProductContent"/>
+        <call-service service-name="updateProductContent" in-map="updateProductContent"/>
         <set-service-fields service-name="updateEmailContent" map="parameters" to-map="updateEmail"/>
-        <call-service service-name="updateEmailContent" in-map-name="updateEmail"/>
+        <call-service service-name="updateEmailContent" in-map="updateEmail"/>
     </simple-method>
 
     <simple-method method-name="createDownloadContentForProduct" short-description="Create Download Content For Product">
@@ -85,28 +85,28 @@
     </simple-method>
     <simple-method method-name="updateDownloadContentForProduct" short-description="Update Email Content For Product">
         <set-service-fields service-name="updateProductContent" map="parameters" to-map="updateProductContent"/>
-        <call-service service-name="updateProductContent" in-map-name="updateProductContent"/>
+        <call-service service-name="updateProductContent" in-map="updateProductContent"/>
         <set-service-fields service-name="updateDownloadContent" map="parameters" to-map="updateDownload"/>
-        <call-service service-name="updateDownloadContent" in-map-name="updateDownload"/>
+        <call-service service-name="updateDownloadContent" in-map="updateDownload"/>
     </simple-method>
 
     <simple-method method-name="createSimpleTextContentForProduct" short-description="Create Simple Text Content For Product">
         <set-service-fields service-name="createProductContent" map="parameters" to-map="createProductContentMap"/>
         <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/>
-        <call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap">
+        <call-service service-name="createSimpleTextContent" in-map="createSimpleTextMap">
             <result-to-field result-name="contentId" map-name="createProductContentMap"/>
         </call-service>
         <call-service service-name="createProductContent" in-map-name="createProductContentMap"/>
     </simple-method>
     <simple-method method-name="updateSimpleTextContentForProduct" short-description="Update Simple Text Content For Product">
         <set-service-fields service-name="updateProductContent" map="parameters" to-map="updateProductContent"/>
-        <call-service service-name="updateProductContent" in-map-name="updateProductContent"/>
+        <call-service service-name="updateProductContent" in-map="updateProductContent"/>
         <set-service-fields service-name="updateSimpleTextContent" map="parameters" to-map="updateSimpleText"/>
-        <call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
+        <call-service service-name="updateSimpleTextContent" in-map="updateSimpleText"/>
     </simple-method>
     <simple-method method-name="createSimpleTextContentForAlternateLocale" short-description="Create Simple Text Content For Alternate Locale">
         <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/>
-        <call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap">
+        <call-service service-name="createSimpleTextContent" in-map="createSimpleTextMap">
             <result-to-field result-name="contentId" field-name="createContentAssocMap.contentIdTo"/>
         </call-service>
         <set field="createContentAssocMap.contentId" from-field="parameters.mainContentId"/>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -146,7 +146,7 @@
         <check-errors/>
 
         <set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/>
-        <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
+        <call-service in-map="createPostalAddressMap" service-name="createPostalAddress">
             <default-message>Postal Address successfully created</default-message>
 
             <result-to-field result-name="contactMechId" map-name="newFacilityContactMech"/>
@@ -171,7 +171,7 @@
         <check-errors/>
 
         <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
-        <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
+        <call-service in-map="updatePostalAddressMap" service-name="updatePostalAddress">
             <default-message>Postal Address successfully updated</default-message>
             <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field-name="contactMechId" />
         </call-service>
@@ -194,7 +194,7 @@
 
         <log level="info" message="Creating telecom number"/>
         <set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/>
-        <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
+        <call-service in-map="createTelecomNumberMap" service-name="createTelecomNumber">
             <default-message>Telecom number successfully created</default-message>
 
             <result-to-field result-name="contactMechId" map-name="newFacilityContactMech"/>
@@ -218,7 +218,7 @@
         <check-errors/>
 
         <set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>
-        <call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap">
+        <call-service service-name="updateTelecomNumber" in-map="updateTelecomNumberMap">
             <default-message>Telecom Number successfully updated</default-message>
             <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field-name="contactMechId" />
         </call-service>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -690,7 +690,7 @@
             <field-to-result field="availableOrNotRequired"/>
         <else>
             <set-service-fields map="parameters" to-map="callServiceMap" service-name="isStoreInventoryAvailable"/>
-            <call-service service-name="isStoreInventoryAvailable" in-map-name="callServiceMap">
+            <call-service service-name="isStoreInventoryAvailable" in-map="callServiceMap">
                 <result-to-result result-name="available" service-result-name="availableOrNotRequired"/>
             </call-service>
         </else>

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -477,7 +477,7 @@
         <now-timestamp-to-env env-name="nowTimestamp"/>
 
         <set-service-fields map="parameters" service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/>
-        <call-service service-name="findOrdersToPickMove" in-map-name="findOrdersToPickMoveMap">
+        <call-service service-name="findOrdersToPickMove" in-map="findOrdersToPickMoveMap">
             <result-to-field result-name="pickMoveByShipmentMethodInfoList"/>
         </call-service>
         <!-- <log level="info" message="pickMoveByShipmentMethodInfoList=${pickMoveByShipmentMethodInfoList}"/> -->
@@ -1116,7 +1116,7 @@
         <now-timestamp-to-env env-name="nowTimestamp"/>
 
         <set-service-fields map="parameters" service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/>
-        <call-service service-name="findOrdersToPickMove" in-map-name="findOrdersToPickMoveMap">
+        <call-service service-name="findOrdersToPickMove" in-map="findOrdersToPickMoveMap">
             <result-to-field result-name="pickMoveByShipmentMethodInfoList"/>
         </call-service>
 

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=730124&r1=730123&r2=730124&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 05:07:57 2008
@@ -117,7 +117,7 @@
             
             <if-empty field="parameters.currentInventoryItemId">
                 <set-service-fields service-name="createInventoryItem" map="parameters" to-map="serviceInMap"/>
-                <call-service service-name="createInventoryItem" in-map-name="serviceInMap">
+                <call-service service-name="createInventoryItem" in-map="serviceInMap">
                     <result-to-field result-name="inventoryItemId" field-name="currentInventoryItemId"/>
                 </call-service>
                 
@@ -126,7 +126,7 @@
                         <set field="parameters.inventoryItemId" from-field="parameters.currentInventoryItemId"/>
                     </if-not-empty> 
                     <set-service-fields service-name="updateInventoryItem" map="parameters" to-map="serviceInMap"/>
-                    <call-service service-name="updateInventoryItem" in-map-name="serviceInMap"/>
+                    <call-service service-name="updateInventoryItem" in-map="serviceInMap"/>
                     <set field="currentInventoryItemId" from-field="parameters.currentInventoryItemId"/>
                 </else>
             </if-empty>