Author: jleroux
Date: Wed Dec 31 13:42:55 2008 New Revision: 730486 URL: http://svn.apache.org/viewvc?rev=730486&view=rev Log: reverted 730468 (<result-to-field(.*)map-name => <result-to-field$1map on *SimpleMethods*.xml, *events*.xml, *formula*.xml, *services*.xml, *tests*.xml was wrong) instead <result-to-field(.*)map-name => <result-to-field$1fiels + <field-to-request(.*)field-name => <field-to-request$1field <field-to-request(.*)map-name => <field-to-request$1request-name + <field-to-result(.*)field-name => <field-to-result$1field <field-to-result(.*)map => <field-to-result$1result-name Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.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/order/OrderSimpleMethods.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.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/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.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/price/PriceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.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/common/script/org/ofbiz/common/PortalPageServices.xml ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.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/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -78,7 +78,7 @@ </calculate> <create-value value-field="newEntity"/> - <field-to-result field="finAccountId" map-name="newEntity" result-name="finAccountId"/> + <field-to-result field="finAccountId" result-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"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Wed Dec 31 13:42:55 2008 @@ -543,7 +543,7 @@ <make-value value-field="invoiceContactMech" entity-name="InvoiceContactMech"/> <set-pk-fields map="parameters" value-field="invoiceContactMech"/> <create-value value-field="invoiceContactMech"/> - <field-to-result field="contactMechId" map-name="invoiceContactMech"/> + <field-to-result field="contactMechId" result-name="invoiceContactMech"/> </simple-method> <simple-method method-name="updateInvoiceItemType" short-description="Updates a InvoiceItemType Record"> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml Wed Dec 31 13:42:55 2008 @@ -30,7 +30,7 @@ <iterate entry="orderHeaderAndPaymentPref" list="orderHeaderAndPaymentPrefs" > <field-to-field map-name="orderHeaderAndPaymentPref" field-name="orderId" to-map-name="captureParams" /> <call-service service-name="capturePayment" in-map-name="captureParams" error-code="ignore-error"> - <result-to-field map="captureResult" result-name="responseMessage" /> + <result-to-field field="captureResult" result-name="responseMessage" /> </call-service> <if-compare operator="equals" field="captureResult.responseMessage" value="error"> <field-to-list map-name="orderHeaderAndPaymentPref" field="orderId" list="badOrders" /> 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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -302,7 +302,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field="contentTypeId" /> + <field-to-result result-name="newEntity" field="contentTypeId" /> </simple-method> <simple-method method-name="updateContentType" short-description="Update Content Type"> <make-value entity-name="ContentType" value-field="lookupKeyValue"/> @@ -338,7 +338,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field="contentAssocTypeId" /> + <field-to-result result-name="newEntity" field="contentAssocTypeId" /> </simple-method> <simple-method method-name="updateContentAssocType" short-description="Update Content AssocType"> <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/> @@ -363,7 +363,7 @@ <make-next-seq-id seq-field-name="contentPurposeTypeId" value-field="newEntity"/> </if-empty> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field="contentPurposeTypeId" /> + <field-to-result result-name="newEntity" field="contentPurposeTypeId" /> </simple-method> <simple-method method-name="updateContentPurposeType" short-description="Update Content PurposeType"> <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/> @@ -385,7 +385,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result map-name="newEntity" field="contentAssocPredicateId" /> + <field-to-result result-name="newEntity" field="contentAssocPredicateId" /> </simple-method> <simple-method method-name="updateContentAssocPredicate" short-description="Update Content AssocPredicate"> <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/> @@ -552,7 +552,7 @@ <call-service service-name="createContentFromUploadedFile" in-map-name="uploadContext"/> </if-not-empty> - <field-to-result field="parentContentId" map-name="parameters" result-name="contentId"/> + <field-to-result field="parentContentId" result-name="parameters" result-name="contentId"/> </simple-method> <!-- Util --> @@ -592,19 +592,19 @@ <set-service-fields service-name="createContent" map="parameters" to-map="createSubjectContent"/> <set from-field="parameters.subject" field="createSubjectEtext.textData"/> <call-service service-name="createElectronicText" in-map-name="createSubjectEtext"> - <result-to-field result-name="dataResourceId" map="createSubjectContent"/> + <result-to-field result-name="dataResourceId" field="createSubjectContent"/> </call-service> <call-service service-name="createContent" in-map-name="createSubjectContent"> - <result-to-field result-name="contentId" map="createBodyAssoc"/> + <result-to-field result-name="contentId" field="createBodyAssoc"/> </call-service> <!-- Create plain body --> <set from-field="parameters.plainBody" field="createPlainBodyEtext.textData"/> <call-service service-name="createElectronicText" in-map-name="createPlainBodyEtext"> - <result-to-field result-name="dataResourceId" map="createPlainBodyContent"/> + <result-to-field result-name="dataResourceId" field="createPlainBodyContent"/> </call-service> <call-service service-name="createContent" in-map-name="createPlainBodyContent"> - <result-to-field result-name="contentId" map="createBodyAssoc" field="contentIdTo"/> + <result-to-field result-name="contentId" field="createBodyAssoc" field="contentIdTo"/> </call-service> <!-- Create content assoc between subject and plain body --> <set value="TREE_CHILD" field="createBodyAssoc.contentAssocTypeId"/> @@ -614,16 +614,16 @@ <!-- Create HTML body --> <set from-field="parameters.htmlBody" field="createHtmlBodyEtext.textData"/> <call-service service-name="createElectronicText" in-map-name="createHtmlBodyEtext"> - <result-to-field result-name="dataResourceId" map="createHtmlBodyContent"/> + <result-to-field result-name="dataResourceId" field="createHtmlBodyContent"/> </call-service> <call-service service-name="createContent" in-map-name="createHtmlBodyContent"> - <result-to-field result-name="contentId" map="createBodyAssoc" field="contentIdTo"/> + <result-to-field result-name="contentId" field="createBodyAssoc" field="contentIdTo"/> </call-service> <!-- Create content assoc between subject and html body --> <set value="htmlBody" field="createBodyAssoc.mapKey"/> <call-service service-name="createContentAssoc" in-map-name="createBodyAssoc"/> - <field-to-result field="contentId" map-name="createBodyAssoc" result-name="contentId"/> + <field-to-result field="contentId" result-name="createBodyAssoc" result-name="contentId"/> </simple-method> <simple-method method-name="updateEmailContent" short-description="Update Email Content"> <check-permission permission="CONTENTMGR" action="_UPDATE"> @@ -657,7 +657,7 @@ <set-service-fields service-name="createContent" map="parameters" to-map="createDownloadContent"/> <set from-field="parameters.file" field="createDownload.dataResourceContent"/> <call-service service-name="createOtherDataResource" in-map-name="createDownload"> - <result-to-field result-name="dataResourceId" map="createDownloadContent"/> + <result-to-field result-name="dataResourceId" field="createDownloadContent"/> </call-service> <call-service service-name="createContent" in-map-name="createDownloadContent"> <result-to-result result-name="contentId"/> @@ -692,8 +692,8 @@ <set value="FTL" field="createSimpleTextDataResource.dataTemplateTypeId"/> <call-service service-name="createDataResource" in-map-name="createSimpleTextDataResource"> - <result-to-field result-name="dataResourceId" map="createSimpleText"/> - <result-to-field result-name="dataResourceId" map="createSimpleTextContent"/> + <result-to-field result-name="dataResourceId" field="createSimpleText"/> + <result-to-field result-name="dataResourceId" field="createSimpleTextContent"/> </call-service> <call-service service-name="createElectronicText" in-map-name="createSimpleText"/> @@ -947,8 +947,8 @@ </and> </condition> <then> - <field-to-result field="contentIdFrom" map-name="parameters" result-name="contentId"/> - <field-to-result field="contentId" map-name="parameters" result-name="contentIdTo"/> + <field-to-result field="contentIdFrom" result-name="parameters" result-name="contentId"/> + <field-to-result field="contentId" result-name="parameters" result-name="contentIdTo"/> <log level="info" message="Converted 'contentId' to 'contentIdTo' and 'contentIdFrom' to 'contentId'"/> </then> <else-if> @@ -958,8 +958,8 @@ </not> </condition> <then> - <field-to-result field="contentIdTo" map-name="parameters" result-name="contentIdTo"/> - <field-to-result field="contentId" map-name="parameters" result-name="contentId"/> + <field-to-result field="contentIdTo" result-name="parameters" result-name="contentIdTo"/> + <field-to-result field="contentId" result-name="parameters" result-name="contentId"/> <log level="info" message="Returned 'contentId' as 'contentId' and 'contentIdTo' as 'contentIdTo'"/> </then> </else-if> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Wed Dec 31 13:42:55 2008 @@ -52,7 +52,7 @@ </if-empty> <create-value value-field="newEntity"/> - <field-to-result field="dataResourceId" map-name="newEntity"/> + <field-to-result field="dataResourceId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateDataResource" short-description="Update a Data Resource"> @@ -68,7 +68,7 @@ <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/> <store-value value-field="lookedUpValue"/> - <field-to-result field="dataResourceId" map-name="lookedUpValue"/> + <field-to-result field="dataResourceId" result-name="lookedUpValue"/> </simple-method> <simple-method method-name="deleteDataResource" short-description="Delete a Data Resource"> @@ -85,7 +85,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="dataCategoryId" map-name="newEntity"/> + <field-to-result field="dataCategoryId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateDataCategory" short-description="Update a Data Category"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> @@ -194,7 +194,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="dataCategoryId" map-name="newEntity"/> + <field-to-result field="dataCategoryId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateDataCategory" short-description="Update Data Category"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> @@ -216,7 +216,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="dataResourceTypeId" map-name="newEntity"/> + <field-to-result field="dataResourceTypeId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateDataResourceType" short-description="Update Data Resource Type"> <make-value entity-name="DataResourceType" value-field="lookupKeyValue"/> @@ -280,7 +280,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="characterSetId" map-name="newEntity"/> + <field-to-result field="characterSetId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateCharacterSet" short-description="Update Character Set"> <make-value entity-name="CharacterSet" value-field="lookupKeyValue"/> @@ -302,7 +302,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="fileExtensionId" map-name="newEntity"/> + <field-to-result field="fileExtensionId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateFileExtension" short-description="Update Data Resource Role"> <make-value entity-name="FileExtension" value-field="lookupKeyValue"/> @@ -324,7 +324,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="metaDataPredicateId" map-name="newEntity"/> + <field-to-result field="metaDataPredicateId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateMetaDataPredicate" short-description="Update Data Resource Role"> <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/> @@ -346,7 +346,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="mimeTypeId" map-name="newEntity"/> + <field-to-result field="mimeTypeId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateMimeType" short-description="Update MimeType"> <make-value entity-name="MimeType" value-field="lookupKeyValue"/> @@ -390,7 +390,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="dataResourceId" map-name="newEntity"/> + <field-to-result field="dataResourceId" result-name="newEntity"/> </simple-method> <simple-method method-name="updateElectronicText" short-description="Update Electronic Text"> @@ -400,7 +400,7 @@ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> - <field-to-result field="dataResourceId" map-name="lookedUpValue"/> + <field-to-result field="dataResourceId" result-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeElectronicText" short-description="Remove Electronic Text"> <make-value entity-name="ElectronicText" value-field="lookupKeyValue"/> @@ -539,7 +539,7 @@ <check-errors/> - <field-to-result map-name="eText" field="textData" result-name="textData"/> + <field-to-result result-name="eText" field="textData" result-name="textData"/> <log level="always" message="result:${result}"/> <log level="always" message="parameters:${parameters}"/> </simple-method> @@ -672,8 +672,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> <return/> </else> </if> @@ -703,8 +703,8 @@ <set from-field="dataResource" field="fileCtx.dataResource"/> <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> </simple-method> <!-- save OTHER_OBJECT data --> @@ -732,8 +732,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> <return/> </else> </if> @@ -759,8 +759,8 @@ </else> </if-compare> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> </simple-method> <!-- save IMAGE_OBJECT data --> @@ -788,8 +788,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> <return/> </else> </if> @@ -815,8 +815,8 @@ </else> </if-compare> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> </simple-method> <!-- save VIDEO_OBJECT data --> @@ -844,8 +844,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> <return/> </else> </if> @@ -871,8 +871,8 @@ </else> </if-compare> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> </simple-method> <!-- save AUDIO_OBJECT data --> @@ -900,8 +900,8 @@ </then> <else> <!-- if not upload is found on an update; its okay, don't do anything just return --> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> <return/> </else> </if> @@ -927,7 +927,7 @@ </else> </if-compare> - <field-to-result field="dataResourceId" map-name="dataResource"/> - <field-to-result field="mimeTypeId" map-name="dataResource"/> + <field-to-result field="dataResourceId" result-name="dataResource"/> + <field-to-result field="mimeTypeId" result-name="dataResource"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Wed Dec 31 13:42:55 2008 @@ -77,14 +77,14 @@ <set-nonpk-fields map="parameters" value-field="content"/> <log level="always" message="content: ${content}"/> <store-value value-field="content"/> - <field-to-request map-name="content" field-name="contentId" request-name="contentId"/> + <field-to-request request-name="content" field="contentId" request-name="contentId"/> <set field="dataResource.dataResourceId" from-field="parameters.dataResourceId"/> <find-by-primary-key entity-name="DataResource" value-field="dataResource" map="dataResource"/> <set-nonpk-fields map="parameters" value-field="dataResource"/> <set field="dataResource.objectInfo" from-field="parameters.drObjectInfo"/> <log level="always" message="dataResource: ${dataResource}"/> <store-value value-field="dataResource"/> - <field-to-request map-name="dataResource" field-name="dataResourceId" request-name="drDataResourceId"/> + <field-to-request request-name="dataResource" field="dataResourceId" request-name="drDataResourceId"/> <check-errors/> </simple-method> @@ -113,14 +113,14 @@ <set field="context.contentTypeId" value="DOCUMENT"/> <call-service in-map-name="context" service-name="persistContentAndAssoc"> - <result-to-field map="context2" field="activeContentId" result-name="contentId"/> + <result-to-field field="context2" field="activeContentId" result-name="contentId"/> <result-to-field field="dataResourceId" result-name="dataResourceId"/> - <result-to-field map="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/> - <result-to-field map="context2" field="fromDate" result-name="fromDate"/> + <result-to-field field="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/> + <result-to-field field="context2" field="fromDate" result-name="fromDate"/> </call-service> <check-errors/> - <field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/> + <field-to-request request-name="context2" field="activeContentId" request-name="contentId"/> <field-to-request field="dataResourceId" request-name="drDataResourceId"/> <set field="currentEntityName" value="SubContentDataResourceView"/> <field-to-request field="currentEntityName" request-name="currentEntityName"/> @@ -209,14 +209,14 @@ <set field="context.contentTypeId" value="DOCUMENT"/> <call-service in-map-name="context" service-name="persistContentAndAssoc"> - <result-to-field map="context2" field="activeContentId" result-name="contentId"/> + <result-to-field field="context2" field="activeContentId" result-name="contentId"/> <result-to-field field="dataResourceId" result-name="dataResourceId"/> - <result-to-field map="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/> - <result-to-field map="context2" field="fromDate" result-name="fromDate"/> + <result-to-field field="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/> + <result-to-field field="context2" field="fromDate" result-name="fromDate"/> </call-service> <check-errors/> - <field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/> + <field-to-request request-name="context2" field="activeContentId" request-name="contentId"/> <field-to-request field="dataResourceId" request-name="drDataResourceId"/> <set field="currentEntityName" value="SubContentDataResourceView"/> <field-to-request field="currentEntityName" request-name="currentEntityName"/> @@ -267,14 +267,14 @@ <set field="context.contentTypeId" value="DOCUMENT"/> <call-service in-map-name="context" service-name="persistContentAndAssoc"> - <result-to-field map="context2" field="activeContentId" result-name="contentId"/> + <result-to-field field="context2" field="activeContentId" result-name="contentId"/> <result-to-field field="dataResourceId" result-name="dataResourceId"/> - <result-to-field map="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/> - <result-to-field map="context2" field="fromDate" result-name="fromDate"/> + <result-to-field field="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/> + <result-to-field field="context2" field="fromDate" result-name="fromDate"/> </call-service> <check-errors/> - <field-to-request map-name="context2" field-name="activeContentId" request-name="contentId"/> + <field-to-request request-name="context2" field="activeContentId" request-name="contentId"/> <field-to-request field="dataResourceId" request-name="drDataResourceId"/> <set field="currentEntityName" value="SubContentDataResourceView"/> <field-to-request field="currentEntityName" request-name="currentEntityName"/> 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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -289,7 +289,7 @@ <set from-field="newUserLogin.currentPassword" field="personUserLoginContext.currentPasswordVerify"/> <!-- the above copy is okay since we checked already that they are the same --> <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext"> - <result-to-field result-name="partyId" map="tempMap"/> + <result-to-field result-name="partyId" field="tempMap"/> <result-to-field field="createdUserLogin" result-name="newUserLogin"/> </call-service> <set-current-user-login value-name="createdUserLogin"/> @@ -314,7 +314,7 @@ <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" map="addressPurposeContext"/> + <result-to-field result-name="contactMechId" field="addressPurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/> <!-- create the shipping location --> @@ -329,7 +329,7 @@ <!-- home phone --> <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> - <result-to-field result-name="contactMechId" map="homePhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="homePhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="homePhonePurposeContext.partyId"/> <set value="PHONE_HOME" field="homePhonePurposeContext.contactMechPurposeTypeId"/> @@ -341,7 +341,7 @@ <!-- work phone --> <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> - <result-to-field result-name="contactMechId" map="workPhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="workPhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="workPhonePurposeContext.partyId"/> <set value="PHONE_WORK" field="workPhonePurposeContext.contactMechPurposeTypeId"/> @@ -351,7 +351,7 @@ <!-- fax phone --> <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> - <result-to-field result-name="contactMechId" map="faxPhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="faxPhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="faxPhonePurposeContext.partyId"/> <set value="FAX_NUMBER" field="faxPhonePurposeContext.contactMechPurposeTypeId"/> @@ -361,7 +361,7 @@ <!-- mobile phone --> <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> - <result-to-field result-name="contactMechId" map="mobilePhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="mobilePhonePurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="mobilePhonePurposeContext.partyId"/> <set value="PHONE_MOBILE" field="mobilePhonePurposeContext.contactMechPurposeTypeId"/> @@ -371,7 +371,7 @@ <!-- email address --> <if-not-empty field="emailContext.emailAddress"> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> - <result-to-field result-name="contactMechId" map="emailPurposeContext"/> + <result-to-field result-name="contactMechId" field="emailPurposeContext"/> </call-service> <set from-field="tempMap.partyId" field="emailPurposeContext.partyId"/> <set value="PRIMARY_EMAIL" field="emailPurposeContext.contactMechPurposeTypeId"/> @@ -671,7 +671,7 @@ <!-- call the create person service --> <call-service service-name="createPerson" in-map-name="personMap"> - <result-to-field result-name="partyId" map="tempMap"/> + <result-to-field result-name="partyId" field="tempMap"/> <result-to-request result-name="partyId"/> </call-service> @@ -761,13 +761,13 @@ <call-service service-name="updatePartyPostalAddress" in-map-name="addressContext"> <!-- this is needed for the "anonymous" checkout process, will be used as the shipping address --> <result-to-request result-name="contactMechId"/> - <result-to-field result-name="contactMechId" map="addressContext"/> + <result-to-field result-name="contactMechId" field="addressContext"/> </call-service> <else> <set field="addressContext.partyId" from-field="partyId"/> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" map="addressContext"/> - <result-to-field result-name="contactMechId" map="addressPurposeContext"/> + <result-to-field result-name="contactMechId" field="addressContext"/> + <result-to-field result-name="contactMechId" field="addressPurposeContext"/> <result-to-request result-name="contactMechId"/> </call-service> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Wed Dec 31 13:42:55 2008 @@ -55,7 +55,7 @@ processor-name="newAffilPostal" in-map-name="parameters" out-map-name="pa_context"/> <check-errors/> <call-service service-name="createPostalAddress" in-map-name="pa_context"> - <result-to-field result-name="contactMechId" map="parameters"/> + <result-to-field result-name="contactMechId" field="parameters"/> </call-service> <!-- Create the Postal Address Purpose --> @@ -69,7 +69,7 @@ processor-name="newAffilPhone" in-map-name="parameters" out-map-name="ph_context"/> <check-errors/> <call-service service-name="createTelecomNumber" in-map-name="ph_context"> - <result-to-field result-name="contactMechId" map="parameters"/> + <result-to-field result-name="contactMechId" field="parameters"/> </call-service> <!-- Create the Phone ContactMech Purpose --> @@ -85,7 +85,7 @@ <if-not-empty field="fax_context.contactNumber"> <call-service service-name="createTelecomNumber" in-map-name="fax_context"> - <result-to-field result-name="contactMechId" map="parameters"/> + <result-to-field result-name="contactMechId" field="parameters"/> </call-service> </if-not-empty> @@ -102,7 +102,7 @@ processor-name="newAffilEmail" in-map-name="parameters" out-map-name="em_context"/> <check-errors/> <call-service service-name="createEmailAddress" in-map-name="em_context"> - <result-to-field result-name="contactMechId" map="parameters"/> + <result-to-field result-name="contactMechId" field="parameters"/> </call-service> <!-- Create the Email ContactMech Purpose --> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml Wed Dec 31 13:42:55 2008 @@ -30,7 +30,7 @@ <number value="10"/> </calcop> </calculate> - <field-to-result field-name="totQuantity" result-name="quantity"/> + <field-to-result field="totQuantity" result-name="quantity"/> </simple-method> <simple-method method-name="linearComponentConsumptionFormula" short-description="Formula that the number of linear components in bom"> @@ -69,6 +69,6 @@ </calculate> </else> </if-compare-field> - <field-to-result field-name="quantity" result-name="quantity"/> + <field-to-result field="quantity" result-name="quantity"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Wed Dec 31 13:42:55 2008 @@ -346,7 +346,7 @@ <set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/> <calculate field="issuanceCreateMap.quantity" ><number value="1"/></calculate> <call-service service-name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/> - <field-to-result field="issuanceCreateMap.quantity" result-name="quantityIssued"/> + <field-to-result field="issuanceCreateresult-name.quantity" result-name="quantityIssued"/> </if-compare> </if-compare> <if> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml Wed Dec 31 13:42:55 2008 @@ -30,7 +30,7 @@ processor-name="copyRoutingTask" in-map-name="lookedUpValue" out-map-name="context"/> <call-service service-name="createWorkEffort" in-map-name="context"> <default-message resource="ManufacturingUiLabels" property="ManufacturingRoutingTaskCopiedSuccessfully"/> - <result-to-field result-name="workEffortId" map="parameters" field="workEffortIdTo"/> + <result-to-field result-name="workEffortId" field="parameters" field="workEffortIdTo"/> </call-service> </if-compare> <if-empty field="parameters.fromDate"> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml Wed Dec 31 13:42:55 2008 @@ -36,6 +36,6 @@ <number value="10"/> </calcop> </calculate> - <field-to-result field-name="totalTime" result-name="totalTime"/> + <field-to-result field="totalTime" result-name="totalTime"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Wed Dec 31 13:42:55 2008 @@ -206,7 +206,7 @@ <if-compare field="parameters.useAddress" operator="equals" value="true"> <set from-field="partyId" field="addressContext.partyId"/> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" map="addressPurposeContext"/> + <result-to-field result-name="contactMechId" field="addressPurposeContext"/> <result-to-request result-name="contactMechId"/> </call-service> <set from-field="tempMap.partyId" field="addressPurposeContext.partyId"/> @@ -229,7 +229,7 @@ <!-- call the create person service --> <call-service service-name="createPerson" in-map-name="personMap"> - <result-to-field result-name="partyId" map="tempMap"/> + <result-to-field result-name="partyId" field="tempMap"/> <result-to-request result-name="partyId"/> </call-service> 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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -399,7 +399,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.statusId" value="RETURN_REQUESTED"/> <!-- default status for new return items --> - <field-to-result field="returnItemSeqId" map-name="newEntity" result-name="returnItemSeqId"/> + <field-to-result field="returnItemSeqId" result-name="newEntity" result-name="returnItemSeqId"/> <log level="info" message="Return Item Seq ID: ${newEntity.returnItemSeqId}"/> <create-value value-field="newEntity"/> <refresh-value value-name="newEntity"/> @@ -625,7 +625,7 @@ </if-compare> <!-- return the current return header status --> - <field-to-result field="statusId" map-name="returnHeader" result-name="returnHeaderStatus"/> + <field-to-result field="statusId" result-name="returnHeader" result-name="returnHeaderStatus"/> </simple-method> <simple-method method-name="createReturnItemResponse" short-description="Create a ReturnItemResponse"> <make-value value-field="newEntity" entity-name="ReturnItemResponse"/> 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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -862,7 +862,7 @@ <add-error><fail-message message="Order not found [{parameters.orderId}]"/></add-error> <check-errors/> </if-empty> - <field-to-result field="statusId" map-name="order" result-name="statusId"/> + <field-to-result field="statusId" result-name="order" result-name="statusId"/> </simple-method> <simple-method method-name="checkOrderIsOnBackOrder" short-description="Check if an Order is on Back Order" login-required="false"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Wed Dec 31 13:42:55 2008 @@ -31,7 +31,7 @@ <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <sequenced-id sequence-name="OrderAdjustment" field="newEntity.orderAdjustmentId"/> - <field-to-result field-name="newEntity.orderAdjustmentId" result-name="orderAdjustmentId"/> + <field-to-result field="newEntity.orderAdjustmentId" result-name="orderAdjustmentId"/> <now-timestamp field="newEntity.createdDate"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> @@ -144,6 +144,6 @@ </if-compare> <!-- return the current return header status --> - <field-to-result field-name="statusId" map-name="orderHeader" result-name="currentStatusId"/> + <field-to-result field="statusId" result-name="orderHeader" result-name="currentStatusId"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Wed Dec 31 13:42:55 2008 @@ -875,8 +875,8 @@ <if-empty field="quoteWorkEffort.quoteId"> <set-nonpk-fields map="parameters" value-field="lookupMap"/> <create-value value-field="lookupMap"/> - <field-to-result field="quoteId" map-name="lookupMap"/> - <field-to-result field="workEffortId" map-name="lookupMap"/> + <field-to-result field="quoteId" result-name="lookupresult-name"/> + <field-to-result field="workEffortId" result-name="lookupresult-name"/> </if-empty> </simple-method> <simple-method method-name="deleteQuoteWorkEffort" short-description="Delete a QuoteWorkEffort"> 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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -70,7 +70,7 @@ <to-string field-name="custRequestId"/> <set from-field="custRequestId" field="newEntity.custRequestId"/> <create-value value-field="newEntity"/> - <field-to-result field="custRequestId" map-name="newEntity"/> + <field-to-result field="custRequestId" result-name="newEntity"/> <!-- jacopoc: Commented out the following code because it is too specific and not valid as a general rule: a user may enter the request from a customer even if he will not work @@ -252,7 +252,7 @@ <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/> <set from-field="parameters.noteInfo" field="newNoteMap.note"/> <call-service service-name="createNote" in-map-name="newNoteMap"> - <result-to-field result-name="noteId" map="newEntity"/> + <result-to-field result-name="noteId" field="newEntity"/> </call-service> <create-value value-field="newEntity"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> @@ -271,7 +271,7 @@ <set from-field="parameters.custRequestItemSeqId" field="newEntity.custRequestItemSeqId"/> <set from-field="parameters.note" field="newNoteMap.note"/> <call-service service-name="createNote" in-map-name="newNoteMap"> - <result-to-field result-name="noteId" map="newEntity"/> + <result-to-field result-name="noteId" field="newEntity"/> </call-service> <create-value value-field="newEntity"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Wed Dec 31 13:42:55 2008 @@ -30,8 +30,8 @@ </if-empty> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> - <field-to-result map-name="newValue" field="contactMechId"/> - <field-to-request map-name="newValue" field-name="contactMechId"/> + <field-to-result result-name="newValue" field="contactMechId"/> + <field-to-request request-name="newValue" field="contactMechId"/> <log level="info" message="Contact mech created with id ${newValue.contactMechId}"/> </simple-method> @@ -72,14 +72,14 @@ <set field="context.infoString" from-field="parameters.infoString"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="${successMessageProperty}"/> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> - <field-to-result map-name="newValue" field="contactMechId"/> - <field-to-request map-name="newValue" field-name="contactMechId"/> + <field-to-result result-name="newValue" field="contactMechId"/> + <field-to-request request-name="newValue" field="contactMechId"/> <else> <log level="info" message="Contact mech not changed"/> - <field-to-result map-name="oldValue" field="contactMechId"/> - <field-to-request map-name="oldValue" field-name="contactMechId"/> + <field-to-result result-name="oldValue" field="contactMechId"/> + <field-to-request request-name="oldValue" field="contactMechId"/> </else> </if-compare-field> </simple-method> @@ -104,12 +104,12 @@ <set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> - <field-to-result map-name="newValue" field="contactMechId"/> - <field-to-request map-name="newValue" field-name="contactMechId"/> + <field-to-result result-name="newValue" field="contactMechId"/> + <field-to-request request-name="newValue" field="contactMechId"/> </simple-method> <simple-method method-name="updatePostalAddress" short-description="Update Contact Mechanism with PostalAddress"> @@ -139,14 +139,14 @@ <log level="info" message="Postal address need updating"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> <create-value value-field="newValue"/> <else> <set field="context.contactMechId" from-field="parameters.contactMechId"/> <call-service service-name="updateContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals"> <log level="info" message="Postal address need updating, contact mech changed"/> @@ -157,9 +157,9 @@ </if-compare-field> </else> </if-compare-field> - <field-to-request map-name="newValue" field-name="contactMechId" request-name="contactMechId"/> - <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/> - <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/> + <field-to-request request-name="newValue" field="contactMechId" request-name="contactMechId"/> + <field-to-result result-name="parameters" field="contactMechId" result-name="oldContactMechId"/> + <field-to-result result-name="newValue" field="contactMechId" result-name="contactMechId"/> </simple-method> <simple-method method-name="createTelecomNumber" short-description="Create Contact Mechanism with Telecom Number"> @@ -167,12 +167,12 @@ <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> <set-nonpk-fields map="parameters" value-field="newValue"/> <create-value value-field="newValue"/> - <field-to-result map-name="newValue" field="contactMechId"/> - <field-to-request map-name="newValue" field-name="contactMechId"/> + <field-to-result result-name="newValue" field="contactMechId"/> + <field-to-request request-name="newValue" field="contactMechId"/> </simple-method> <simple-method method-name="updateTelecomNumber" short-description="Update Contact Mechanism with Telecom Number"> @@ -186,14 +186,14 @@ <log level="info" message="Telecom number needs updating"/> <call-service service-name="createContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> <create-value value-field="newValue"/> <else> <set field="context.contactMechId" from-field="parameters.contactMechId"/> <call-service service-name="updateContactMech" in-map-name="context"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals"> <log level="info" message="Telecom Number need updating, contact mech changed"/> @@ -204,8 +204,8 @@ </if-compare-field> </else> </if-compare-field> - <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/> - <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/> + <field-to-result result-name="newValue" field="contactMechId" result-name="contactMechId"/> + <field-to-result result-name="parameters" field="contactMechId" result-name="oldContactMechId"/> </simple-method> <simple-method method-name="createEmailAddress" short-description="Create an email address contact mechanism"> 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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -52,7 +52,8 @@ <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"> - <result-to-field result-name="contactMechId" map="newValue"/> + <result-to-field result-name="" field=""/> + <result-to-field result-name="contactMechId" field="newValue"/> </call-service> <log level="info" message="ContactMech created"/> <else> @@ -61,8 +62,8 @@ </if-empty> <log level="info" message="Creating a PartyContactMech with id: ${parameters.contactMechId}"/> <set field="newValue.partyId" from-field="parameters.partyId"/> - <field-to-result field="contactMechId" map-name="newValue"/> - <field-to-request field="contactMechId" map-name="newValue"/> + <field-to-result field="contactMechId" result-name="newValue"/> + <field-to-request field="contactMechId" request-name="newValue"/> <set-nonpk-fields map="parameters" value-field="newValue"/> <now-timestamp field="newValue.fromDate"/> <create-value value-field="newValue"/> @@ -93,7 +94,7 @@ <set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/> <call-service service-name="updateContactMech" in-map-name="updateContactMechMap"> <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map="newPartyContactMech"/> + <result-to-field result-name="contactMechId" field="newPartyContactMech"/> </call-service> <else> <set field="newPartyContactMech.contactMechId" from-field="parameters.newContactMechId"/> @@ -161,7 +162,7 @@ <set-service-fields service-name="createPostalAddress" map="parameters" to-map="createPostalAddressMap"/> <call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map="newPartyContactMech"/> + <result-to-field result-name="contactMechId" field="newPartyContactMech"/> </call-service> <check-errors/> @@ -172,8 +173,8 @@ <call-service service-name="createPartyContactMech" in-map-name="createPartyContactMechMap" break-on-error="true"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> </call-service> - <field-to-request field="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field="contactMechId" map-name="newPartyContactMech"/> + <field-to-request field="contactMechId" request-name="newPartyContactMech"/> + <field-to-result field="contactMechId" result-name="newPartyContactMech"/> </simple-method> <simple-method method-name="updatePartyPostalAddress" short-description="Update a PostalAddress for party"> @@ -185,7 +186,7 @@ <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/> <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map="newPartyContactMech" field="contactMechId" /> + <result-to-field result-name="contactMechId" field="newPartyContactMech" field="contactMechId" /> </call-service> <set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/> @@ -195,8 +196,8 @@ <call-service service-name="updatePartyContactMech" in-map-name="updatePartyContactMechMap"> <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> </call-service> - <field-to-request field="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field="contactMechId" map-name="newPartyContactMech"/> + <field-to-request field="contactMechId" request-name="newPartyContactMech"/> + <field-to-result field="contactMechId" result-name="newPartyContactMech"/> </simple-method> <simple-method method-name="createPartyTelecomNumber" short-description="Create a TelecomNumber for party"> @@ -208,7 +209,7 @@ <set-service-fields service-name="createTelecomNumber" map="parameters" to-map="createTelecomNumberMap"/> <call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> - <result-to-field result-name="contactMechId" map="newPartyContactMech"/> + <result-to-field result-name="contactMechId" field="newPartyContactMech"/> </call-service> <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="createPartyContactMechMap"/> @@ -219,8 +220,8 @@ <call-service service-name="createPartyContactMech" in-map-name="createPartyContactMechMap" break-on-error="true"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> </call-service> - <field-to-request field="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field="contactMechId" map-name="newPartyContactMech"/> + <field-to-request field="contactMechId" request-name="newPartyContactMech"/> + <field-to-result field="contactMechId" result-name="newPartyContactMech"/> </simple-method> <simple-method method-name="updatePartyTelecomNumber" short-description="Update a TelecomNumber for party"> @@ -232,7 +233,7 @@ <set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/> <call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap"> <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> - <result-to-field result-name="contactMechId" map="newPartyContactMech" field="contactMechId" /> + <result-to-field result-name="contactMechId" field="newPartyContactMech" field="contactMechId" /> </call-service> <set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/> @@ -244,8 +245,8 @@ <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> </call-service> <log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/> - <field-to-request field="contactMechId" map-name="newPartyContactMech"/> - <field-to-result field="contactMechId" map-name="newPartyContactMech"/> + <field-to-request field="contactMechId" request-name="newPartyContactMech"/> + <field-to-result field="contactMechId" result-name="newPartyContactMech"/> </simple-method> <simple-method method-name="createPartyEmailAddress" short-description="Create an email address for party"> @@ -286,7 +287,7 @@ <result-to-result result-name="contactMechId"/> <result-to-request result-name="contactMechId"/> </call-service> - <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/> + <field-to-result result-name="parameters" field="contactMechId" result-name="oldContactMechId"/> </simple-method> <simple-method method-name="findPartyFromEmailAddress" short-description="Find partyId from email address"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Wed Dec 31 13:42:55 2008 @@ -259,7 +259,7 @@ <set field="personUserLoginContext.currentPasswordVerify" from-field="newUserLogin.currentPassword" /> <!-- the above copy is okay since we checked already that they are the same --> <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext"> - <result-to-field result-name="partyId" map="tempMap"/> + <result-to-field result-name="partyId" field="tempMap"/> <result-to-field field="createdUserLogin" result-name="newUserLogin"/> </call-service> <set-current-user-login value-name="createdUserLogin"/> @@ -284,7 +284,7 @@ <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> - <result-to-field result-name="contactMechId" map="addressPurposeContext"/> + <result-to-field result-name="contactMechId" field="addressPurposeContext"/> </call-service> <set field="addressPurposeContext.partyId" from-field="tempMap.partyId" /> <!-- create the shipping location --> @@ -299,7 +299,7 @@ <!-- home phone --> <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> - <result-to-field result-name="contactMechId" map="homePhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="homePhonePurposeContext"/> </call-service> <set field="homePhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="homePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_HOME" /> @@ -309,7 +309,7 @@ <!-- work phone --> <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> - <result-to-field result-name="contactMechId" map="workPhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="workPhonePurposeContext"/> </call-service> <set field="workPhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="workPhonePurposeContext.contactMechPurposeTypeId" value="PHONE_WORK" /> @@ -319,7 +319,7 @@ <!-- fax phone --> <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> - <result-to-field result-name="contactMechId" map="faxPhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="faxPhonePurposeContext"/> </call-service> <set field="faxPhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="faxPhonePurposeContext.contactMechPurposeTypeId" value="FAX_NUMBER" /> @@ -329,7 +329,7 @@ <!-- mobile phone --> <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> - <result-to-field result-name="contactMechId" map="mobilePhonePurposeContext"/> + <result-to-field result-name="contactMechId" field="mobilePhonePurposeContext"/> </call-service> <set field="mobilePhonePurposeContext.partyId" from-field="tempMap.partyId" /> <set field="mobilePhonePurposeContext.contactMechPurposeTypeId" value="PHONE_MOBILE" /> @@ -338,14 +338,14 @@ <!-- email address --> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> - <result-to-field result-name="contactMechId" map="emailPurposeContext"/> + <result-to-field result-name="contactMechId" field="emailPurposeContext"/> </call-service> <set field="emailPurposeContext.partyId" from-field="tempMap.partyId" /> <set field="emailPurposeContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" /> <call-service service-name="createPartyContactMechPurpose" in-map-name="emailPurposeContext"/> <!-- set the partyId in the request --> - <field-to-request field="partyId" map-name="tempMap" request-name="partyId"/> + <field-to-request field="partyId" request-name="tempMap" request-name="partyId"/> </simple-method> </simple-methods> 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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008 @@ -434,7 +434,7 @@ <set from-field="dataResourceMap" field="fileCtx.dataResource"/> <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/> </if-not-empty> - <field-to-result map-name="parameters" field="contentId" result-name="contentId" /> + <field-to-result result-name="parameters" field="contentId" result-name="contentId" /> </simple-method> <!-- get parties based on PartyRelationship --> @@ -698,18 +698,18 @@ <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals"> <set field="found" value="notImportant"/> <if-not-empty field="telephone.countryCode"> - <field-to-result map-name="telephone" field="countryCode"/> + <field-to-result result-name="telephone" field="countryCode"/> </if-not-empty> <if-not-empty field="telephone.areaCode"> - <field-to-result map-name="telephone" field="areaCode"/> + <field-to-result result-name="telephone" field="areaCode"/> </if-not-empty> <if-not-empty field="telephone.contactNumber"> - <field-to-result map-name="telephone" field="contactNumber"/> + <field-to-result result-name="telephone" field="contactNumber"/> </if-not-empty> <if-not-empty field="telephone.extension"> - <field-to-result map-name="telephone" field="extension"/> + <field-to-result result-name="telephone" field="extension"/> </if-not-empty> - <field-to-result map-name="telephone" field="contactMechPurposeTypeId"/> + <field-to-result result-name="telephone" field="contactMechPurposeTypeId"/> </if-compare-field> </if-empty> </iterate> @@ -719,16 +719,16 @@ <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2"/> <first-from-list entry="telephone" list="telephoneAll2"/> <if-not-empty field="telephone.tnCountryCode"> - <field-to-result map-name="telephone" field="tnCountryCode" result-name="countryCode"/> + <field-to-result result-name="telephone" field="tnCountryCode" result-name="countryCode"/> </if-not-empty> <if-not-empty field="telephone.tnAreaCode"> - <field-to-result map-name="telephone" field="tnAreaCode" result-name="areaCode"/> + <field-to-result result-name="telephone" field="tnAreaCode" result-name="areaCode"/> </if-not-empty> <if-not-empty field="telephone.tnContactNumber"> - <field-to-result map-name="telephone" field="tnContactNumber" result-name="contactNumber"/> + <field-to-result result-name="telephone" field="tnContactNumber" result-name="contactNumber"/> </if-not-empty> <if-not-empty field="telephone.extension"> - <field-to-result map-name="telephone" field="extension"/> + <field-to-result result-name="telephone" field="extension"/> </if-not-empty> </else> </if-not-empty> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Wed Dec 31 13:42:55 2008 @@ -97,7 +97,7 @@ <result-to-field result-name="contentId" field="contentId"/> </call-service> <!-- set the partyId in the request --> - <field-to-request field="partyId" map-name="formInput.formInput" request-name="partyId"/> + <field-to-request field="partyId" request-name="formInput.formInput" request-name="partyId"/> <field-to-request field="contentId" request-name="contentId"/> </simple-method> <!-- Update party content --> @@ -123,7 +123,7 @@ <result-to-field result-name="contentId" field="contentId"/> </call-service> <!-- set the partyId in the request --> - <field-to-request field="partyId" map-name="formInput.formInput" request-name="partyId"/> + <field-to-request field="partyId" request-name="formInput.formInput" request-name="partyId"/> <field-to-request field="contentId" request-name="contentId"/> </simple-method> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml?rev=730486&r1=730485&r2=730486&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml Wed Dec 31 13:42:55 2008 @@ -77,7 +77,7 @@ <set-service-fields service-name="createPerson" map-name="parameters" to-map-name="createPersonCtx"/> <call-service service-name="createPerson" in-map-name="createPersonCtx"> - <result-to-field result-name="partyId" map="createUlInMap"/> + <result-to-field result-name="partyId" field="createUlInMap"/> </call-service> <!-- call the service with the system account to get around security constraints for this special create --> @@ -88,8 +88,8 @@ <call-service service-name="createUserLogin" in-map-name="createUlInMap"/> <entity-one entity-name="UserLogin" value-name="newUserLogin"/> - <field-to-result field-name="newUserLogin"/> - <field-to-result field-name="createUlInMap.partyId" result-name="partyId"/> + <field-to-result field="newUserLogin"/> + <field-to-result field="createUlInresult-name.partyId" result-name="partyId"/> </simple-method> <!-- Simple method to create a person, its role and basic contact mechs --> @@ -186,7 +186,7 @@ <set field="postalAddressContext.partyId" from-field="partyId"/> <set field="postalAddressContext.contactMechPurposeTypeId" value="GENERAL_LOCATION"/> <call-service service-name="createPartyPostalAddress" in-map-name="postalAddressContext"> - <result-to-field result-name="contactMechId" map="postalAddressContext"/> + <result-to-field result-name="contactMechId" field="postalAddressContext"/> </call-service> <if-not-empty field="postalAddContactMechPurpTypeId"> |
Free forum by Nabble | Edit this page |