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/31 22:42:57 UTC
svn commit: r730486 [2/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/content/...
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -293,7 +293,7 @@
<check-errors/>
<call-service service-name="createPerson" in-map-name="personContext">
- <result-to-field result-name="partyId" map="tempMap"/>
+ <result-to-field result-name="partyId" field="tempMap"/>
</call-service>
<!-- now that we have the partyId, put it where it needs to go... -->
@@ -329,7 +329,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 -->
@@ -344,7 +344,7 @@
<!-- home phone -->
<if-not-empty field="parameters.USER_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" />
@@ -354,7 +354,7 @@
<!-- work phone -->
<if-not-empty field="parameters.USER_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" />
@@ -364,7 +364,7 @@
<!-- fax phone -->
<if-not-empty field="parameters.USER_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" />
@@ -374,7 +374,7 @@
<!-- mobile phone -->
<if-not-empty field="parameters.USER_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" />
@@ -384,14 +384,14 @@
<!-- email address -->
<if-not-empty field="parameters.USER_EMAIL">
<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"/>
</if-not-empty>
<!-- 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"/>
<!--send New User Email Notification-->
<set field="emailContext.partyId" from-field="partyId"/>
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -199,7 +199,7 @@
<set field="categoryId" from-field="category.productCategoryId"/>
<set field="categoriesMap.${categoryId}" from-field="fileStatusMap" />
</iterate>
- <field-to-result field="categoriesMap" result-name="categoriesMap"/>
+ <field-to-result field="categoriesresult-name" result-name="categoriesresult-name"/>
</if-not-empty>
</simple-method>
@@ -397,7 +397,7 @@
<!-- set-service-fields service-name="updateProductCategory" map-name="category" to-map-name="updateProductCategoryContext"/>
<call-service service-name="updateProductCategory" in-map-name="updateProductCategoryContext" / -->
<store-value value-field="category"/>
- <field-to-result field="filesImageMap" result-name="filesImageMap"/>
+ <field-to-result field="filesImageresult-name" result-name="filesImageresult-name"/>
</if-not-empty>
</simple-method>
<simple-method method-name="checkImageUrlForProduct" short-description="Check for image url exists or not for product" login-required="false">
@@ -460,7 +460,7 @@
<clear-field field="detailImageUrl" map-name="product"></clear-field>
</if-compare>
</if-not-empty>
- <field-to-result field="filesImageMap" result-name="filesImageMap"/>
+ <field-to-result field="filesImageresult-name" result-name="filesImageresult-name"/>
<store-value value-field="product"/>
<!-- set-service-fields service-name="updateProduct" map-name="product" to-map-name="updateProductContext"/>
<call-service service-name="updateProduct" in-map-name="updateProductContext" / -->
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field="contentId"/>
- <field-to-result map-name="newEntity" field="productCategoryId"/>
- <field-to-result map-name="newEntity" field="prodCatContentTypeId"/>
+ <field-to-result result-name="newEntity" field="contentId"/>
+ <field-to-result result-name="newEntity" field="productCategoryId"/>
+ <field-to-result result-name="newEntity" field="prodCatContentTypeId"/>
</simple-method>
<simple-method method-name="updateCategoryContent" short-description="Update Content For Category">
<make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
@@ -60,7 +60,7 @@
<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">
- <result-to-field result-name="contentId" map="createCategoryContentMap" />
+ <result-to-field result-name="contentId" field="createCategoryContentMap" />
</call-service>
<call-service service-name="createCategoryContent" in-map-name="createCategoryContentMap"/>
</simple-method>
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -782,7 +782,7 @@
</call-service>
<if-compare field="genericResult.hasPermission" operator="equals" value="false" type="Boolean">
<field-to-result field="genericResult.hasPermission" result-name="hasPermission"/>
- <field-to-result field="genericResult.failMessage" map-name="failMessage"/>
+ <field-to-result field="genericResult.failMessage" result-name="failMessage"/>
<return/>
</if-compare>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Wed Dec 31 13:42:55 2008
@@ -37,7 +37,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field="fromDate" map-name="newEntity"/>
+ <field-to-result field="fromDate" result-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -80,7 +80,7 @@
<sequenced-id sequence-name="ProductConfigItem" field="newEntity.configItemId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
- <field-to-result field="configItemId" map-name="newEntity"/>
+ <field-to-result field="configItemId" result-name="newEntity"/>
</simple-method>
<simple-method method-name="updateProductConfigItem" short-description="Update a Config Item">
<check-permission action="_UPDATE" permission="CATALOG">
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field="contentId"/>
- <field-to-result map-name="newEntity" field="configItemId"/>
- <field-to-result map-name="newEntity" field="confItemContentTypeId"/>
+ <field-to-result result-name="newEntity" field="contentId"/>
+ <field-to-result result-name="newEntity" field="configItemId"/>
+ <field-to-result result-name="newEntity" field="confItemContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem">
<make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
@@ -62,7 +62,7 @@
<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" >
- <result-to-field result-name="contentId" map="createProductConfigItemContent" />
+ <result-to-field result-name="contentId" field="createProductConfigItemContent" />
</call-service>
<call-service service-name="createProductConfigItemContent" in-map-name="createProductConfigItemContent"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Wed Dec 31 13:42:55 2008
@@ -25,7 +25,7 @@
<make-value value-field="newEntity" entity-name="CostComponent"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/>
- <field-to-result field="costComponentId" map-name="newEntity"/>
+ <field-to-result field="costComponentId" result-name="newEntity"/>
<if-empty field="newEntity.fromDate">
<now-timestamp field="newEntity.fromDate"/>
</if-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Wed Dec 31 13:42:55 2008
@@ -383,7 +383,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field="fromDate" map-name="newEntity"/>
+ <field-to-result field="fromDate" result-name="newEntity"/>
<set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
<set field="newEntity.createdDate" from-field="nowTimestamp" />
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -278,7 +278,7 @@
</else>
</if-compare>
- <field-to-result field="quantityNotReserved" map-name="parameters"/>
+ <field-to-result field="quantityNotReserved" result-name="parameters"/>
</simple-method>
<simple-method method-name="reserveAnInventoryItem" short-description="Reserve a Specific Serialized InventoryItem">
@@ -372,7 +372,7 @@
<!-- store OrderItemShipGrpInvRes record -->
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field="reserveOisgirMap"/>
- <field-to-result field="inventoryItemId" map-name="inventoryItem"/>
+ <field-to-result field="inventoryItemId" result-name="inventoryItem"/>
</simple-method>
<simple-method method-name="reserveForInventoryItemInline" short-description="Does a reservation for one InventoryItem, meant to be called in-line">
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -672,8 +672,8 @@
</if-compare>
</iterate>
- <field-to-result field="availableToPromiseTotal" map-name="parameters"/>
- <field-to-result field="quantityOnHandTotal" map-name="parameters"/>
+ <field-to-result field="availableToPromiseTotal" result-name="parameters"/>
+ <field-to-result field="quantityOnHandTotal" result-name="parameters"/>
</simple-method>
<simple-method method-name="getMktgPackagesAvailable" short-description="Get Marketing Packages Available From Components In Inventory" login-required="false" use-transaction="false">
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -464,7 +464,7 @@
<!-- 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">
- <result-to-field result-name="inventoryItemId" map="targetInventoryItem"/>
+ <result-to-field result-name="inventoryItemId" field="targetInventoryItem"/>
</call-service>
<!-- refresh the value object now that the create has been done -->
<refresh-value value-name="targetInventoryItem"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Wed Dec 31 13:42:55 2008
@@ -37,7 +37,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field="fromDate" map-name="newEntity"/>
+ <field-to-result field="fromDate" result-name="newEntity"/>
<set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
<set field="newEntity.createdDate" from-field="nowTimestamp" />
@@ -56,7 +56,7 @@
<entity-one entity-name="ProductPrice" value-field="lookedUpValue"/>
<!-- grab the old price value before setting nonpk parameter fields -->
- <field-to-result map-name="lookedUpValue" field="price" result-name="oldPrice"/>
+ <field-to-result result-name="lookedUpValue" field="price" result-name="oldPrice"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -78,7 +78,7 @@
<find-by-primary-key entity-name="ProductPrice" map="lookupPKMap" value-field="lookedUpValue"/>
<!-- grab the old price value before setting nonpk parameter fields -->
- <field-to-result map-name="lookedUpValue" field="price" result-name="oldPrice"/>
+ <field-to-result result-name="lookedUpValue" field="price" result-name="oldPrice"/>
<remove-value value-field="lookedUpValue"/>
</simple-method>
@@ -146,7 +146,7 @@
<make-value value-field="newEntity" entity-name="ProductPriceRule"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ProductPriceRule" field="newEntity.productPriceRuleId"/>
- <field-to-result field="productPriceRuleId" map-name="newEntity"/>
+ <field-to-result field="productPriceRuleId" result-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -182,7 +182,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
- <field-to-result field="productPriceCondSeqId" map-name="newEntity"/>
+ <field-to-result field="productPriceCondSeqId" result-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -218,7 +218,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
- <field-to-result field="productPriceActionSeqId" map-name="newEntity"/>
+ <field-to-result field="productPriceActionSeqId" result-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Wed Dec 31 13:42:55 2008
@@ -52,9 +52,9 @@
<create-value value-field="createProductSupplierMap"/>
<field-to-result field="productId"/>
- <field-to-result field="createProductSupplierMap.currencyUomId" result-name="currencyUomId"/>
- <field-to-result field="createProductSupplierMap.minimumOrderQuantity" result-name="minimumOrderQuantity"/>
- <field-to-result field="createProductSupplierMap.availableFromDate" result-name="availableFromDate"/>
+ <field-to-result field="createProductSupplierresult-name.currencyUomId" result-name="currencyUomId"/>
+ <field-to-result field="createProductSupplierresult-name.minimumOrderQuantity" result-name="minimumOrderQuantity"/>
+ <field-to-result field="createProductSupplierresult-name.availableFromDate" result-name="availableFromDate"/>
<!-- create association with ProductStore.digProdUploadCategoryId -->
<entity-one entity-name="ProductStore" value-field="productStore"/>
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field="contentId"/>
- <field-to-result map-name="newEntity" field="productId"/>
- <field-to-result map-name="newEntity" field="productContentTypeId"/>
+ <field-to-result result-name="newEntity" field="contentId"/>
+ <field-to-result result-name="newEntity" field="productId"/>
+ <field-to-result result-name="newEntity" field="productContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductContent" short-description="Update Content For Product">
<make-value value-field="lookupPKMap" entity-name="ProductContent"/>
@@ -62,7 +62,7 @@
<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" >
- <result-to-field result-name="contentId" map="createProductContent" />
+ <result-to-field result-name="contentId" field="createProductContent" />
</call-service>
<call-service service-name="createProductContent" in-map-name="createProductContent"/>
</simple-method>
@@ -79,7 +79,7 @@
<set field="persistContentAndAssoc.contentTypeId" value="DOCUMENT"/>
<set field="persistContentAndAssoc.dataResourceTypeId" value="IMAGE_OBJECT"/>
<call-service service-name="persistContentAndAssoc" in-map-name="persistContentAndAssoc" break-on-error="true" >
- <result-to-field result-name="contentId" map="createProductContent" />
+ <result-to-field result-name="contentId" field="createProductContent" />
</call-service>
<call-service service-name="createProductContent" in-map-name="createProductContent"/>
</simple-method>
@@ -94,7 +94,7 @@
<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">
- <result-to-field result-name="contentId" map="createProductContentMap"/>
+ <result-to-field result-name="contentId" field="createProductContentMap"/>
</call-service>
<call-service service-name="createProductContent" in-map-name="createProductContentMap"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Wed Dec 31 13:42:55 2008
@@ -38,7 +38,7 @@
<check-errors/>
</else>
</if-empty>
- <field-to-result field="productId" map-name="newEntity" result-name="productId"/>
+ <field-to-result field="productId" result-name="newEntity" result-name="productId"/>
<now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.createdDate"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml Wed Dec 31 13:42:55 2008
@@ -151,6 +151,6 @@
<calcop operator="get" field-name="productFactor"/>
</calcop>
</calculate>
- <field-to-result field-name="totQuantity" result-name="convertedValue"/>
+ <field-to-result field="totQuantity" result-name="convertedValue"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Wed Dec 31 13:42:55 2008
@@ -29,7 +29,7 @@
<make-value value-field="newEntity" entity-name="ProductPromo"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ProductPromo" field="newEntity.productPromoId"/>
- <field-to-result field="productPromoId" map-name="newEntity"/>
+ <field-to-result field="productPromoId" result-name="newEntity"/>
<if-empty field="newEntity.userEntered">
<set value="Y" set-if-empty="true" field="newEntity.userEntered"/>
@@ -84,7 +84,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
- <field-to-result field="productPromoActionSeqId" map-name="newEntity"/>
+ <field-to-result field="productPromoActionSeqId" result-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -157,7 +157,7 @@
<sequenced-id sequence-name="ProductPromoCode" field="newEntity.productPromoCodeId" stagger-max="100"/>
</if-empty>
- <field-to-result field="productPromoCodeId" map-name="newEntity"/>
+ <field-to-result field="productPromoCodeId" result-name="newEntity"/>
<now-timestamp field="nowTimestamp"/>
<if-empty field="newEntity.fromDate">
@@ -253,7 +253,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
- <field-to-result field="productPromoCondSeqId" map-name="newEntity"/>
+ <field-to-result field="productPromoCondSeqId" result-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -323,7 +323,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
- <field-to-result field="productPromoRuleId" map-name="newEntity"/>
+ <field-to-result field="productPromoRuleId" result-name="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
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=730486&r1=730485&r2=730486&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 Wed Dec 31 13:42:55 2008
@@ -32,7 +32,7 @@
<set field="createContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId" />
<call-service service-name="createContactMech" in-map-name="createContactMechMap">
<default-message>Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" map="newValue"/>
+ <result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
<log level="info" message="ContactMech created"/>
<else>
@@ -41,8 +41,8 @@
</if-empty>
<log level="info" message="Creating a FacilityContactMech with id: ${parameters.contactMechId}"/>
<set field="newValue.facilityId" from-field="parameters.facilityId" />
- <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"/>
@@ -77,7 +77,7 @@
<call-service service-name="updateContactMech" in-map-name="updateContactMechMap">
<default-message>Contact Mechanism successfully updated.</default-message>
- <result-to-field result-name="contactMechId" map="newFacilityContactMech"/>
+ <result-to-field result-name="contactMechId" field="newFacilityContactMech"/>
</call-service>
<else>
<set field="newFacilityContactMech.contactMechId" from-field="parameters.newContactMechId"/>
@@ -149,7 +149,7 @@
<call-service in-map-name="createPostalAddressMap" service-name="createPostalAddress">
<default-message>Postal Address successfully created</default-message>
- <result-to-field result-name="contactMechId" map="newFacilityContactMech"/>
+ <result-to-field result-name="contactMechId" field="newFacilityContactMech"/>
</call-service>
<check-errors/>
@@ -161,8 +161,8 @@
<default-message>Facility Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" result-name="newFacilityContactMech"/>
</simple-method>
<simple-method method-name="updateFacilityPostalAddress" short-description="Update a PostalAddress for facility">
@@ -173,7 +173,7 @@
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
<call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
<default-message>Postal Address successfully updated</default-message>
- <result-to-field result-name="contactMechId" map="newFacilityContactMech" field="contactMechId" />
+ <result-to-field result-name="contactMechId" field="newFacilityContactMech" field="contactMechId" />
</call-service>
<set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
@@ -184,8 +184,8 @@
<call-service service-name="updateFacilityContactMech" in-map-name="updateFacilityContactMechMap">
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
- <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" result-name="newFacilityContactMech"/>
</simple-method>
<simple-method method-name="createFacilityTelecomNumber" short-description="Create a TelecomNumber for facility">
@@ -197,7 +197,7 @@
<call-service in-map-name="createTelecomNumberMap" service-name="createTelecomNumber">
<default-message>Telecom number successfully created</default-message>
- <result-to-field result-name="contactMechId" map="newFacilityContactMech"/>
+ <result-to-field result-name="contactMechId" field="newFacilityContactMech"/>
</call-service>
<set-service-fields service-name="createFacilityContactMech" map="parameters" to-map="createFacilityContactMechMap"/>
@@ -208,8 +208,8 @@
<default-message>Facility Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" result-name="newFacilityContactMech"/>
</simple-method>
<simple-method method-name="updateFacilityTelecomNumber" short-description="Update a TelecomNumber for facility">
@@ -220,7 +220,7 @@
<set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>
<call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap">
<default-message>Telecom Number successfully updated</default-message>
- <result-to-field result-name="contactMechId" map="newFacilityContactMech" field="contactMechId" />
+ <result-to-field result-name="contactMechId" field="newFacilityContactMech" field="contactMechId" />
</call-service>
<set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
@@ -233,8 +233,8 @@
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
<log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
- <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" request-name="newFacilityContactMech"/>
+ <field-to-result field="contactMechId" result-name="newFacilityContactMech"/>
</simple-method>
@@ -304,7 +304,7 @@
<create-value value-field="newEntity"/>
- <field-to-result field="fromDate" map-name="newEntity" result-name="fromDate"/>
+ <field-to-result field="fromDate" result-name="newEntity" result-name="fromDate"/>
</simple-method>
<simple-method method-name="deleteFacilityContactMechPurpose" short-description="Delete a facility/contact mech purpose">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Wed Dec 31 13:42:55 2008
@@ -31,7 +31,7 @@
<make-value value-field="newEntity" entity-name="ItemIssuance"/>
<sequenced-id sequence-name="ItemIssuance" field="newEntity.itemIssuanceId"/>
- <field-to-result field="itemIssuanceId" map-name="newEntity"/>
+ <field-to-result field="itemIssuanceId" result-name="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<now-timestamp field="newEntity.issuedDateTime"/>
@@ -291,7 +291,7 @@
<set from-field="parameters.shipmentId" field="shipmentItemCreate.shipmentId"/>
<set from-field="parameters.quantity" field="shipmentItemCreate.quantity"/>
<call-service service-name="createShipmentItem" in-map-name="shipmentItemCreate">
- <result-to-field result-name="shipmentItemSeqId" map="shipmentItemLookupPk"/>
+ <result-to-field result-name="shipmentItemSeqId" field="shipmentItemLookupPk"/>
</call-service>
<set from-field="parameters.shipmentId" field="shipmentItemLookupPk.shipmentId"/>
<find-by-primary-key entity-name="ShipmentItem" map="shipmentItemLookupPk" value-field="shipmentItem"/>
@@ -304,7 +304,7 @@
<store-value value-field="shipmentItem"/>
</else>
</if-empty>
- <field-to-result field="shipmentItemSeqId" map-name="shipmentItem" result-name="shipmentItemSeqId"/>
+ <field-to-result field="shipmentItemSeqId" result-name="shipmentItem" result-name="shipmentItemSeqId"/>
</simple-method>
<simple-method method-name="callCreateItemIssuance" short-description="Call Create ItemIssuance - meant to be called in-line">
<!-- create the ItemIssuance -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Dec 31 13:42:55 2008
@@ -791,7 +791,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- if no shipmentItemSeqId, generate one based on existing items, ie one greater than the current higher number -->
<make-next-seq-id value-field="newEntity" seq-field-name="shipmentItemSeqId"/>
- <field-to-result field="shipmentItemSeqId" map-name="newEntity" result-name="shipmentItemSeqId"/>
+ <field-to-result field="shipmentItemSeqId" result-name="newEntity" result-name="shipmentItemSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateShipmentItem" short-description="Update ShipmentItem">
@@ -921,7 +921,7 @@
<!-- if no shipmentPackageSeqId, generate one based on existing items, ie one greater than the current higher number -->
<make-next-seq-id value-field="newEntity" seq-field-name="shipmentPackageSeqId"/>
- <field-to-result field="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
+ <field-to-result field="shipmentPackageSeqId" result-name="newEntity" result-name="shipmentPackageSeqId"/>
<now-timestamp field="newEntity.dateCreated"/>
@@ -996,7 +996,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
- <field-to-result field="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
+ <field-to-result field="shipmentPackageSeqId" result-name="newEntity" result-name="shipmentPackageSeqId"/>
</simple-method>
<simple-method method-name="updateShipmentPackageContent" short-description="Update ShipmentPackageContent">
<check-permission permission="FACILITY" action="_UPDATE">
@@ -1147,7 +1147,7 @@
<!-- if no shipmentRouteSegmentSeqId, generate one based on existing items, ie one greater than the current higher number -->
<make-next-seq-id value-field="newEntity" seq-field-name="shipmentRouteSegmentId"/>
- <field-to-result field="shipmentRouteSegmentId" map-name="newEntity" result-name="shipmentRouteSegmentId"/>
+ <field-to-result field="shipmentRouteSegmentId" result-name="newEntity" result-name="shipmentRouteSegmentId"/>
<if-empty field="newEntity.carrierServiceStatusId">
<set value="SHRSCS_NOT_STARTED" field="newEntity.carrierServiceStatusId"/>
@@ -1606,7 +1606,7 @@
</if-compare>
</if-not-empty>
</iterate>
- <field-to-result field="shipmentId" map-name="parameters"/>
+ <field-to-result field="shipmentId" result-name="parameters"/>
</iterate>
</simple-method>
@@ -1666,7 +1666,7 @@
<set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
<call-service service-name="addShipmentContentToPackage" in-map-name="shipItemContext">
<result-to-field result-name="shipmentPackageSeqId" field="packageMap.${parameters.trackingNum}"/>
- <result-to-field result-name="shipmentPackageSeqId" map="routeSegLookup"/>
+ <result-to-field result-name="shipmentPackageSeqId" field="routeSegLookup"/>
</call-service>
<if-not-empty field="routeSegLookup.shipmentPackageSeqId">
@@ -1795,7 +1795,7 @@
<set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
<call-service service-name="addShipmentContentToPackage" in-map-name="shipItemContext">
<result-to-field result-name="shipmentPackageSeqId" field="packageMap.${itemMap.trackingNum}"/>
- <result-to-field result-name="shipmentPackageSeqId" map="routeSegLookup"/>
+ <result-to-field result-name="shipmentPackageSeqId" field="routeSegLookup"/>
</call-service>
<if-not-empty field="routeSegLookup.shipmentPackageSeqId">
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Wed Dec 31 13:42:55 2008
@@ -332,7 +332,7 @@
</simple-method>
<simple-method method-name="unlinkInvoiceFromTimeEntry" short-description="Delete TimeEntry">
<entity-one entity-name="TimeEntry" value-field="lookedUpValue"/>
- <field-to-result field="invoiceId" map-name="lookedUpValue"/>
+ <field-to-result field="invoiceId" result-name="lookedUpValue"/>
<clear-field field="lookedUpValue.invoiceId"/>
<store-value value-field="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Wed Dec 31 13:42:55 2008
@@ -211,8 +211,8 @@
<set field="eventWe.description" from-field="parameters.relationDescription"/>
<create-value value-field="lookupMap"/>
</if-empty>
- <field-to-result field="workEffortId" map-name="lookupMap"/>
- <field-to-result field="communicationEventId" map-name="lookupMap"/>
+ <field-to-result field="workEffortId" result-name="lookupresult-name"/>
+ <field-to-result field="communicationEventId" result-name="lookupresult-name"/>
</simple-method>
<simple-method method-name="updateCommunicationEventWorkEff" short-description="Delete a CommunicationEventWorkEff">
@@ -322,14 +322,14 @@
<set-service-fields service-name="createPartyContactMech" map="parameters" to-map="context"/>
<call-service service-name="createPartyContactMech" in-map-name="context">
<default-message>Party Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" map="newValue"/>
+ <result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
<log level="info" message="Party ContactMech created"/>
<else>
<set-service-fields service-name="createContactMech" map="parameters" to-map="context"/>
<call-service service-name="createContactMech" in-map-name="context">
<default-message>Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" map="newValue"/>
+ <result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
<log level="info" message="ContactMech created"/>
</else>
@@ -341,8 +341,8 @@
<log level="info" message="Creating a WorkEffortContactMech"/>
<set from-field="parameters.workEffortId" field="newValue.workEffortId"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
- <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"/>
<create-value value-field="newValue"/>
</simple-method>
@@ -366,7 +366,7 @@
<log level="info" message="Calling generic updateContactMech method"/>
<call-service service-name="updateContactMech" in-map-name="context">
<default-message>Contact Mechanism successfully updated.</default-message>
- <result-to-field result-name="contactMechId" map="newWorkEffortContactMech"/>
+ <result-to-field result-name="contactMechId" field="newWorkEffortContactMech"/>
</call-service>
<else>
<set from-field="parameters.newContactMechId" field="newWorkEffortContactMech.contactMechId"/>
@@ -379,8 +379,8 @@
<remove-value value-field="workEffortContactMech"/>
</if-compare-field>
- <field-to-result field="contactMechId" map-name="newWorkEffortContactMech"/>
- <field-to-request field="contactMechId" map-name="newWorkEffortContactMech"/>
+ <field-to-result field="contactMechId" result-name="newWorkEffortContactMech"/>
+ <field-to-request field="contactMechId" request-name="newWorkEffortContactMech"/>
</simple-method>
<simple-method method-name="deleteWorkEffortContactMech" short-description="Delete a WorkEffortContactMech">
@@ -401,7 +401,7 @@
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service service-name="createPartyPostalAddress" in-map-name="context">
<default-message>Party Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" map="newValue"/>
+ <result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
<log level="info" message="Party ContactMech created"/>
<else>
@@ -409,7 +409,7 @@
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="createPostalAddress">
<default-message>Postal Address successfully created</default-message>
- <result-to-field result-name="contactMechId" map="newValue"/>
+ <result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
</else>
</if-not-empty>
@@ -421,8 +421,8 @@
<call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech">
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="updateWorkEffortPostalAddress" short-description="Update a PostalAddress for WorkEffort">
@@ -431,7 +431,7 @@
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="updatePostalAddress">
<default-message>Postal Address successfully updated</default-message>
- <result-to-field result-name="contactMechId" map="newValue" field="contactMechId" />
+ <result-to-field result-name="contactMechId" field="newValue" field="contactMechId" />
</call-service>
<call-map-processor xml-resource="org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml"
processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/>
@@ -441,8 +441,8 @@
<call-service in-map-name="context2" service-name="updateWorkEffortContactMech">
<default-message>WorkEffort Contact Mechanism successfully updated</default-message>
</call-service>
- <field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="createWorkEffortTelecomNumber" short-description="Create a TelecomNumber for WorkEffort">
@@ -453,7 +453,7 @@
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service service-name="createPartyTelecomNumber" in-map-name="context">
<default-message>Party Contact Mechanism successfully created.</default-message>
- <result-to-field result-name="contactMechId" map="newValue"/>
+ <result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
<log level="info" message="Party ContactMech created"/>
<else>
@@ -461,7 +461,7 @@
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="createTelecomNumber">
<default-message>Telecom number successfully created</default-message>
- <result-to-field result-name="contactMechId" map="newValue"/>
+ <result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
</else>
</if-not-empty>
@@ -472,8 +472,8 @@
<call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech">
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="updateWorkEffortTelecomNumber" short-description="Update a TelecomNumber for WorkEffort">
@@ -482,7 +482,7 @@
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service in-map-name="context" service-name="updateTelecomNumber">
<default-message>Telecom Number successfully updated</default-message>
- <result-to-field result-name="contactMechId" map="newValue" field="contactMechId" />
+ <result-to-field result-name="contactMechId" field="newValue" field="contactMechId" />
</call-service>
<call-map-processor xml-resource="org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml"
@@ -494,8 +494,8 @@
<default-message>Party Contact Mechanism successfully updated</default-message>
</call-service>
<log level="info" message="Setting result id: ${newValue.contactMechId}"/>
- <field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-request field="contactMechId" request-name="newValue"/>
+ <field-to-result field="contactMechId" result-name="newValue"/>
</simple-method>
<simple-method method-name="createWorkEffortEmailAddress" short-description="Create an email address for WorkEffort">
@@ -700,7 +700,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="custRequestId" map-name="lookupMap"/>
+ <field-to-result field="custRequestId" result-name="lookupresult-name"/>
</simple-method>
<simple-method method-name="deleteWorkEffortRequest" short-description="Delete a CustRequestWorkEffort">
<entity-one entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/>
@@ -756,7 +756,7 @@
</if-not-empty>
<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="quoteId" result-name="lookupresult-name"/>
</simple-method>
<simple-method method-name="deleteWorkEffortQuote" short-description="Delete a QuoteWorkEffort">
<entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort"/>
@@ -778,7 +778,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="requirementId" map-name="lookupMap"/>
+ <field-to-result field="requirementId" result-name="lookupresult-name"/>
</simple-method>
<simple-method method-name="deleteWorkRequirementFulfillment" short-description="Delete a WorkRequirementFulfillment">
<entity-one entity-name="WorkRequirementFulfillment" value-field="workRequirementFulfillment"/>
@@ -800,7 +800,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="shoppingListId" map-name="lookupMap"/>
+ <field-to-result field="shoppingListId" result-name="lookupresult-name"/>
</simple-method>
<simple-method method-name="deleteShoppingListWorkEffort" short-description="Delete a ShoppingListWorkEffort">
<entity-one entity-name="ShoppingListWorkEffort" value-field="shoppingListWorkEffort"/>
@@ -822,7 +822,7 @@
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
<create-value value-field="lookupMap"/>
- <field-to-result field="orderId" map-name="lookupMap"/>
+ <field-to-result field="orderId" result-name="lookupresult-name"/>
</simple-method>
<simple-method method-name="deleteOrderHeaderWorkEffort" short-description="Delete a OrderHeaderWorkEffort">
<entity-one entity-name="OrderHeaderWorkEffort" value-field="orderWorkEffort"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Wed Dec 31 13:42:55 2008
@@ -101,7 +101,7 @@
<iterate list="attributeList" entry="attributeRecord">
<set field="attributeMap.${attributeRecord.attrName}" from-field="attributeRecord.attrValue"/>
</iterate>
- <field-to-result field="attributeMap" result-name="attributeMap"/>
+ <field-to-result field="attributeresult-name" result-name="attributeresult-name"/>
</simple-method>
<simple-method method-name="createPortalPage" short-description="Create a new Portal Page">
Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Wed Dec 31 13:42:55 2008
@@ -25,7 +25,7 @@
short-description="Create FixedAssetMaint and Update Schedule information in WorkEffort">
<set-service-fields map="parameters" service-name="createFixedAssetMaint" to-map="createFixedAssetMaintCtx"/>
<call-service service-name="createFixedAssetMaint" in-map-name="createFixedAssetMaintCtx">
- <result-to-field result-name="maintHistSeqId" map="findAssetMaintLookup" field="maintHistSeqId"/>
+ <result-to-field result-name="maintHistSeqId" field="findAssetMaintLookup" field="maintHistSeqId"/>
<result-to-request result-name="maintHistSeqId"/>
</call-service>
<check-errors/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Dec 31 13:42:55 2008
@@ -118,7 +118,7 @@
<simple-method method-name="updateTaskAssigment"
short-description="Update task to resource assignment, if required create a new one by re-assigment">
- <field-to-result map-name="parameters" field="workEffortId"/>
+ <field-to-result result-name="parameters" field="workEffortId"/>
<if>
<!-- check if a change in partyId Or roletypeId: need to delete and create new -->
<condition>
@@ -239,7 +239,7 @@
2. call a recursive java function to set all the dependant tasks.
-->
- <field-to-result map-name="parameters" field="projectId"/>
+ <field-to-result result-name="parameters" field="projectId"/>
<!-- find a starting point being either the estimated start date of a project or the earliest actual start date. -->
<entity-condition entity-name="ProjectAndPhaseAndTask" list="tasks">
@@ -515,7 +515,7 @@
</entity-one>
<if-empty field="project">
- <field-to-result map-name="parameters" field="projectId"/>
+ <field-to-result result-name="parameters" field="projectId"/>
<add-error error-list-name="error_list"><fail-message message="Project: ${parameters.projectId} not found"/></add-error>
</if-empty>
<if-not-empty field="parameters.workEffortName">
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730486&r1=730485&r2=730486&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Wed Dec 31 13:42:55 2008
@@ -141,8 +141,8 @@
<result-to-field result-name="contentId" field="contentId"/>
</call-service>
<!-- set the partyId in the request -->
- <field-to-request field="workEffortId" map-name="context" request-name="workEffortId"/>
- <field-to-request field="projectId" map-name="context" request-name="projectId"/>
+ <field-to-request field="workEffortId" request-name="context" request-name="workEffortId"/>
+ <field-to-request field="projectId" request-name="context" request-name="projectId"/>
<field-to-request field="contentId" request-name="contentId"/>
</simple-method>
@@ -178,6 +178,6 @@
<!-- set the partyId in the request -->
<field-to-request field="workEffortId" request-name="workEffortId"/>
<field-to-request field="projectId" request-name="projectId"/>
- <field-to-request field="contentId" map-name="context"/>
+ <field-to-request field="contentId" request-name="context"/>
</simple-method>
</simple-methods>