You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:22:44 UTC
svn commit: r730122 [3/3] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/acc...
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 04:22:42 2008
@@ -418,7 +418,7 @@
<add-error><fail-message message="ProductStore with id ${productStoreId} has Y for oneInventoryFacility but inventoryFacilityId is empty, not reserving inventory."/></add-error>
<check-errors/>
</if-empty>
- <set-service-fields map-name="parameters" to-map-name="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
<set from-field="productStore.inventoryFacilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -462,7 +462,7 @@
<first-from-list list="productStoreFacilities" entry="storeFound"/>
</if-empty>
<set from-field="storeFound.facilityId" field="facilityId" default-value=""/>
- <set-service-fields map-name="parameters" to-map-name="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -487,7 +487,7 @@
<add-error><fail-message message="Facility with id ${parameters.facilityId} is not associated to ProductStore with id ${parameters.productStoreId}, not reserving inventory."/></add-error>
<check-errors/>
</if-empty>
- <set-service-fields map-name="parameters" to-map-name="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -689,7 +689,7 @@
<set value="Y" field="availableOrNotRequired"/>
<field-to-result field="availableOrNotRequired"/>
<else>
- <set-service-fields map-name="parameters" to-map-name="callServiceMap" service-name="isStoreInventoryAvailable"/>
+ <set-service-fields map="parameters" to-map="callServiceMap" service-name="isStoreInventoryAvailable"/>
<call-service service-name="isStoreInventoryAvailable" in-map-name="callServiceMap">
<result-to-result result-name="available" service-result-name="availableOrNotRequired"/>
</call-service>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 04:22:42 2008
@@ -476,7 +476,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
- <set-service-fields map-name="parameters" service-name="findOrdersToPickMove" to-map-name="findOrdersToPickMoveMap"/>
+ <set-service-fields map="parameters" service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/>
<call-service service-name="findOrdersToPickMove" in-map-name="findOrdersToPickMoveMap">
<result-to-field result-name="pickMoveByShipmentMethodInfoList"/>
</call-service>
@@ -542,7 +542,7 @@
<clear-field field="createPicklistItemMap"/>
<set from-field="picklistBinId" field="createPicklistItemMap.picklistBinId"/>
<set field="createPicklistItemMap.itemStatusId" value="PICKITEM_PENDING"/>
- <set-service-fields service-name="createPicklistItem" map-name="orderItemShipGrpInvRes" to-map-name="createPicklistItemMap"/>
+ <set-service-fields service-name="createPicklistItem" map="orderItemShipGrpInvRes" to-map="createPicklistItemMap"/>
<set field="createPicklistItemMap.quantity" from-field="quantityToPick"/>
<call-service service-name="createPicklistItem" in-map-name="createPicklistItemMap"/>
<calculate field-name="itemsInBin">
@@ -757,7 +757,7 @@
<fail-message message="Security Error: to run setPicklistItemToComplete you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <set-service-fields service-name="updatePicklistItem" map-name="parameters" to-map-name="serviceCtx"/>
+ <set-service-fields service-name="updatePicklistItem" map="parameters" to-map="serviceCtx"/>
<set field="serviceCtx.itemStatusId" value="PICKITEM_COMPLETED"/>
<call-service service-name="updatePicklistItem" in-map-name="serviceCtx" include-user-login="true"/>
</simple-method>
@@ -1115,7 +1115,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
- <set-service-fields map-name="parameters" service-name="findOrdersToPickMove" to-map-name="findOrdersToPickMoveMap"/>
+ <set-service-fields map="parameters" service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/>
<call-service service-name="findOrdersToPickMove" in-map-name="findOrdersToPickMoveMap">
<result-to-field result-name="pickMoveByShipmentMethodInfoList"/>
</call-service>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 04:22:42 2008
@@ -116,7 +116,7 @@
<clear-field field="currentInventoryItemId"/>
<if-empty field="parameters.currentInventoryItemId">
- <set-service-fields service-name="createInventoryItem" map-name="parameters" to-map-name="serviceInMap"/>
+ <set-service-fields service-name="createInventoryItem" map="parameters" to-map="serviceInMap"/>
<call-service service-name="createInventoryItem" in-map-name="serviceInMap">
<result-to-field result-name="inventoryItemId" field-name="currentInventoryItemId"/>
</call-service>
@@ -125,7 +125,7 @@
<if-not-empty field="parameters.currentInventoryItemId">
<set field="parameters.inventoryItemId" from-field="parameters.currentInventoryItemId"/>
</if-not-empty>
- <set-service-fields service-name="updateInventoryItem" map-name="parameters" to-map-name="serviceInMap"/>
+ <set-service-fields service-name="updateInventoryItem" map="parameters" to-map="serviceInMap"/>
<call-service service-name="updateInventoryItem" in-map-name="serviceInMap"/>
<set field="currentInventoryItemId" from-field="parameters.currentInventoryItemId"/>
</else>
@@ -134,7 +134,7 @@
<!-- do this only for non-serialized inventory -->
<if-compare value="SERIALIZED_INV_ITEM" operator="not-equals" field="parameters.inventoryItemTypeId">
<clear-field field="serviceInMap"/>
- <set-service-fields service-name="createInventoryItemDetail" map-name="parameters" to-map-name="serviceInMap"/>
+ <set-service-fields service-name="createInventoryItemDetail" map="parameters" to-map="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<call-service service-name="createInventoryItemDetail" in-map-name="serviceInMap">
<result-to-field result-name="inventoryItemDetailSeqId" field-name="parameters.inventoryItemDetailSeqId"/>
@@ -142,7 +142,7 @@
</if-compare>
<clear-field field="serviceInMap"/>
- <set-service-fields service-name="createShipmentReceipt" map-name="parameters" to-map-name="serviceInMap"/>
+ <set-service-fields service-name="createShipmentReceipt" map="parameters" to-map="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<call-service service-name="createShipmentReceipt" in-map-name="serviceInMap"/>
@@ -177,7 +177,7 @@
</if>
<clear-field field="serviceInMap"/>
- <set-service-fields service-name="balanceInventoryItems" map-name="parameters" to-map-name="serviceInMap"/>
+ <set-service-fields service-name="balanceInventoryItems" map="parameters" to-map="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<call-service service-name="balanceInventoryItems" in-map-name="serviceInMap"/>
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=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 04:22:42 2008
@@ -160,7 +160,7 @@
<set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedStartDate"/>
<set from-field="parameters.estimatedShipDate" field="estShipWe.estimatedCompletionDate"/>
<set from-field="parameters.originFacilityId" field="estShipWe.facilityId"/>
- <set-service-fields service-name="updateWorkEffort" map-name="estShipWe" to-map-name="estShipWeUpdMap"/>
+ <set-service-fields service-name="updateWorkEffort" map="estShipWe" to-map="estShipWeUpdMap"/>
<call-service service-name="updateWorkEffort" in-map-name="estShipWeUpdMap"/>
</then>
</if>
@@ -183,7 +183,7 @@
<set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedStartDate"/>
<set from-field="parameters.estimatedArrivalDate" field="estimatedArrivalWorkEffort.estimatedCompletionDate"/>
<set from-field="parameters.destinationFacilityId" field="estimatedArrivalWorkEffort.facilityId"/>
- <set-service-fields service-name="updateWorkEffort" map-name="estimatedArrivalWorkEffort" to-map-name="estimatedArrivalWorkEffortUpdMap"/>
+ <set-service-fields service-name="updateWorkEffort" map="estimatedArrivalWorkEffort" to-map="estimatedArrivalWorkEffortUpdMap"/>
<call-service service-name="updateWorkEffort" in-map-name="estimatedArrivalWorkEffortUpdMap"/>
</then>
</if>
@@ -300,7 +300,7 @@
</simple-method>
<simple-method method-name="createShipmentAndItemsForReturn" short-description="Create Shipment and ShipmentItems based on ReturnHeader and ReturnItems">
- <set-service-fields service-name="createShipmentForReturn" map-name="parameters" to-map-name="shipmentCtx"/>
+ <set-service-fields service-name="createShipmentForReturn" map="parameters" to-map="shipmentCtx"/>
<call-service service-name="createShipmentForReturn" in-map-name="shipmentCtx">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -332,7 +332,7 @@
</simple-method>
<simple-method method-name="createShipmentAndItemsForVendorReturn" short-description="Create Shipment and ShipmentItems based on primaryReturnId for Vendor return">
- <set-service-fields service-name="createShipment" map-name="parameters" to-map-name="shipmentCtx"/>
+ <set-service-fields service-name="createShipment" map="parameters" to-map="shipmentCtx"/>
<call-service service-name="createShipment" in-map-name="shipmentCtx">
<result-to-field result-name="shipmentId"/>
</call-service>
@@ -607,7 +607,7 @@
<call-service service-name="createShipmentRouteSegment" in-map-name="shipmentRouteSegmentMap"/>
</if-empty>
- <set-service-fields service-name="updateShipment" map-name="shipment" to-map-name="shipmentUpdateMap"/>
+ <set-service-fields service-name="updateShipment" map="shipment" to-map="shipmentUpdateMap"/>
<call-service service-name="updateShipment" in-map-name="shipmentUpdateMap"/>
</simple-method>
@@ -673,7 +673,7 @@
</if-not-empty>
<if-compare-field field="shipment" to-field="shipmentCopy" operator="not-equals">
- <set-service-fields service-name="updateShipment" map-name="shipment" to-map-name="shipmentUpdateMap"/>
+ <set-service-fields service-name="updateShipment" map="shipment" to-map="shipmentUpdateMap"/>
<call-service service-name="updateShipment" in-map-name="shipmentUpdateMap"/>
</if-compare-field>
</simple-method>
@@ -841,7 +841,7 @@
</calcop>
</calculate>
<!-- update the original ShipmentItem -->
- <set-service-fields service-name="updateShipmentItem" map-name="originalShipmentItem" to-map-name="updateOriginalShipmentItemMap"/>
+ <set-service-fields service-name="updateShipmentItem" map="originalShipmentItem" to-map="updateOriginalShipmentItemMap"/>
<call-service service-name="updateShipmentItem" in-map-name="updateOriginalShipmentItemMap"/>
<!-- split the OrderShipment record(s) as well for the new quantities,
@@ -857,7 +857,7 @@
<if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="Double">
<!-- there is enough in this OrderShipment record, so just adjust it and move on -->
<clear-field field="updateOrderShipmentMap"/>
- <set-service-fields service-name="updateOrderShipment" map-name="itemOrderShipment" to-map-name="updateOrderShipmentMap"/>
+ <set-service-fields service-name="updateOrderShipment" map="itemOrderShipment" to-map="updateOrderShipmentMap"/>
<calculate field-name="updateOrderShipmentMap.quantity" type="Double">
<calcop operator="add" field-name="itemOrderShipment.quantity">
<calcop operator="negative" field-name="orderShipmentQuantityLeft"/>
@@ -878,7 +878,7 @@
<else>
<!-- not enough on this one, create a new one for the new item and delete this one -->
<clear-field field="deleteOrderShipmentMap"/>
- <set-service-fields service-name="deleteOrderShipment" map-name="itemOrderShipment" to-map-name="deleteOrderShipmentMap"/>
+ <set-service-fields service-name="deleteOrderShipment" map="itemOrderShipment" to-map="deleteOrderShipmentMap"/>
<call-service service-name="deleteOrderShipment" in-map-name="deleteOrderShipmentMap"/>
<clear-field field="createOrderShipmentMap"/>
@@ -1037,7 +1037,7 @@
<find-by-primary-key value-field="shipmentPackageContent" map="newEntity"/>
<log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/>
<if-empty field="shipmentPackageContent">
- <set-service-fields service-name="createShipmentPackageContent" map-name="parameters" to-map-name="createSPCMap"/>
+ <set-service-fields service-name="createShipmentPackageContent" map="parameters" to-map="createSPCMap"/>
<call-service service-name="createShipmentPackageContent" in-map-name="createSPCMap">
<result-to-field result-name="shipmentPackageSeqId" field-name="newEntity.shipmentPackageSeqId"/>
</call-service>
@@ -1046,7 +1046,7 @@
<calculate field-name="shipmentPackageContent.quantity" type="Double">
<calcop field-name="shipmentPackageContent.quantity" operator="add"><calcop field-name="parameters.quantity" operator="get"/></calcop>
</calculate>
- <set-service-fields service-name="updateShipmentPackageContent" map-name="shipmentPackageContent" to-map-name="updateSPCMap"/>
+ <set-service-fields service-name="updateShipmentPackageContent" map="shipmentPackageContent" to-map="updateSPCMap"/>
<call-service service-name="updateShipmentPackageContent" in-map-name="updateSPCMap"/>
</else>
</if-empty>
@@ -1623,7 +1623,7 @@
<get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-name="orderItemShipGrpInvRes"/>
<if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">
<!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
- <set-service-fields map-name="parameters" to-map-name="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
+ <set-service-fields map="parameters" to-map="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
<call-service service-name="reserveAnInventoryItem" in-map-name="reserveAnInventoryItemCtx">
<result-to-field result-name="inventoryItemId" field-name="parameters.inventoryItemId"/>
</call-service>
@@ -1993,7 +1993,7 @@
</entity-and>
<iterate entry="orderShipment" list="orderShipmentList">
<clear-field field="deleteOrderShipmentMap"/>
- <set-service-fields service-name="deleteOrderShipment" map-name="orderShipment" to-map-name="deleteOrderShipmentMap"/>
+ <set-service-fields service-name="deleteOrderShipment" map="orderShipment" to-map="deleteOrderShipmentMap"/>
<call-service service-name="deleteOrderShipment" in-map-name="deleteOrderShipmentMap"/>
</iterate>
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=730122&r1=730121&r2=730122&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 Tue Dec 30 04:22:42 2008
@@ -77,7 +77,7 @@
<simple-method method-name="createTimesheets" short-description="Creates Timesheet multiple parties at a time">
<iterate list="parameters.partyIdList" entry="partyId">
<set field="parameters.partyId" from-field="partyId"/>
- <set-service-fields to-map-name="createParams" service-name="createTimesheet" map-name="parameters"/>
+ <set-service-fields to-map="createParams" service-name="createTimesheet" map="parameters"/>
<call-service service-name="createTimesheet" in-map-name="createParams"/>
</iterate>
</simple-method>
@@ -89,7 +89,7 @@
<get-related value-name="timesheet" relation-name="TimeEntry" list-name="timeEntryList"/>
<if-empty field="parameters.invoiceId">
- <set-service-fields service-name="createInvoice" map-name="parameters" to-map-name="createInvoiceMap"/>
+ <set-service-fields service-name="createInvoice" map="parameters" to-map="createInvoiceMap"/>
<set field="createInvoiceMap.invoiceTypeId" value="SALES_INVOICE"/>
<set field="createInvoiceMap.statusId" value="INVOICE_IN_PROCESS"/>
<call-service service-name="createInvoice" in-map-name="createInvoiceMap">
@@ -114,7 +114,7 @@
<check-errors/>
<entity-one entity-name="WorkEffort" value-field="workEffort"/>
<if-empty field="parameters.invoiceId">
- <set-service-fields service-name="createInvoice" map-name="parameters" to-map-name="createInvoiceMap"/>
+ <set-service-fields service-name="createInvoice" map="parameters" to-map="createInvoiceMap"/>
<set field="createInvoiceMap.invoiceTypeId" value="SALES_INVOICE"/>
<set field="createInvoiceMap.statusId" value="INVOICE_IN_PROCESS"/>
<call-service service-name="createInvoice" in-map-name="createInvoiceMap">
@@ -342,7 +342,7 @@
<entity-one entity-name="TimeEntry" value-field="timeEntry"/>
- <set-service-fields service-name="getRateAmount" map-name="parameters" to-map-name="getRate"/>
+ <set-service-fields service-name="getRateAmount" map="parameters" to-map="getRate"/>
<set field="getRate.rateCurrencyUomId" from-field="parameters.currencyUomId"/>
<set field="getRate.rateTypeId" from-field="timeEntry.rateTypeId"/>
<if-empty field="timeEntry.partyId">
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=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Dec 30 04:22:42 2008
@@ -22,11 +22,11 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createWorkEffortAndPartyAssign" short-description="Create Work Effort and assign to a party with a role">
- <set-service-fields service-name="createWorkEffort" map-name="parameters" to-map-name="create"/>
+ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="create"/>
<call-service service-name="createWorkEffort" in-map-name="create">
<result-to-field result-name="workEffortId"/>
</call-service>
- <set-service-fields service-name="assignPartyToWorkEffort" map-name="parameters" to-map-name="assign"/>
+ <set-service-fields service-name="assignPartyToWorkEffort" map="parameters" to-map="assign"/>
<set field="assign.workEffortId" from-field="workEffortId"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assign"/>
<field-to-result field="workEffortId"/>
@@ -305,7 +305,7 @@
<store-value value-name="workEffortPartyAssignment"/>
</simple-method>
<simple-method method-name="deletePartyToWorkEffortAssignment" short-description="Update WorkEffortPartyAssignment entity">
- <set-service-fields service-name="updatePartyToWorkEffortAssignment" map-name="parameters" to-map-name="del"/>
+ <set-service-fields service-name="updatePartyToWorkEffortAssignment" map="parameters" to-map="del"/>
<now-date-to-env env-name="del.thruDate"/>
<call-service service-name="updatePartyToWorkEffortAssignment" in-map-name="del"/>
</simple-method>
@@ -319,14 +319,14 @@
<make-value value-field="newValue" entity-name="WorkEffortContactMech"/>
<if-empty field="parameters.contactMechId">
<if-not-empty field="parameters.partyId">
- <set-service-fields service-name="createPartyContactMech" map-name="parameters" to-map-name="context"/>
+ <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-name="newValue"/>
</call-service>
<log level="info" message="Party ContactMech created"/>
<else>
- <set-service-fields service-name="createContactMech" map-name="parameters" to-map-name="context"/>
+ <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-name="newValue"/>
@@ -600,14 +600,14 @@
<check-errors/>
<else>
<if-empty field="parameters.workEffortIdTo">
- <set-service-fields service-name="createWorkEffort" map-name="parameters" to-map-name="createWorkeEffortParams"/>
+ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createWorkeEffortParams"/>
<call-service in-map-name="createWorkeEffortParams" service-name="createWorkEffort">
<result-to-result result-name="workEffortId"/>
<result-to-field result-name="workEffortId" field-name="workEffortIdTo"/>
</call-service>
<set field="parameters.workEffortIdTo" from-field="workEffortIdTo"/>
</if-empty>
- <set-service-fields service-name="createWorkEffortAssoc" map-name="parameters" to-map-name="createWorkEffortAssocParams"/>
+ <set-service-fields service-name="createWorkEffortAssoc" map="parameters" to-map="createWorkEffortAssocParams"/>
<call-service in-map-name="createWorkEffortAssocParams" service-name="createWorkEffortAssoc"/>
</else>
</if-not-empty>
Modified: ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml?rev=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml (original)
+++ ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml Tue Dec 30 04:22:42 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="quickInitDataWarehouse" short-description="">
- <set-service-fields service-name="loadDateDimension" map-name="parameters" to-map-name="inMap"/>
+ <set-service-fields service-name="loadDateDimension" map="parameters" to-map="inMap"/>
<call-service service-name="loadDateDimension" in-map-name="inMap"/>
<check-errors/>
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=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Dec 30 04:22:42 2008
@@ -57,7 +57,7 @@
</entity-and>
<iterate list="portalPortletList" entry="portalPortlet">
- <set-service-fields service-name="deletePortalPagePortlet" to-map-name="deletePortalPagePortletInMap" map-name="portalPortlet"/>
+ <set-service-fields service-name="deletePortalPagePortlet" to-map="deletePortalPagePortletInMap" map="portalPortlet"/>
<call-service service-name="deletePortalPagePortlet" in-map-name="deletePortalPagePortletInMap"/>
</iterate>
@@ -131,7 +131,7 @@
</entity-and>
<iterate list="portalPageColumnList" entry="portalPageColumn">
- <set-service-fields service-name="deletePortalPageColumn" to-map-name="deletePortalPageColumnInMap" map-name="portalPageColumn"/>
+ <set-service-fields service-name="deletePortalPageColumn" to-map="deletePortalPageColumnInMap" map="portalPageColumn"/>
<call-service service-name="deletePortalPageColumn" in-map-name="deletePortalPageColumnInMap"/>
</iterate>
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=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Tue Dec 30 04:22:42 2008
@@ -23,7 +23,7 @@
<simple-method method-name="createFixedAssetMaintUpdateWorkEffort" login-required="true"
short-description="Create FixedAssetMaint and Update Schedule information in WorkEffort">
- <set-service-fields map-name="parameters" service-name="createFixedAssetMaint" to-map-name="createFixedAssetMaintCtx"/>
+ <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-name="findAssetMaintLookup" field-name="maintHistSeqId"/>
<result-to-request result-name="maintHistSeqId"/>
@@ -32,20 +32,20 @@
<set from-field="parameters.fixedAssetId" field="findAssetMaintLookup.fixedAssetId"/>
<find-by-primary-key entity-name="FixedAssetMaint" map="findAssetMaintLookup" value-field="findAssetMaint"/>
<set from-field="findAssetMaint.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/>
- <set-service-fields map-name="parameters" service-name="updateWorkEffort" to-map-name="updateWorkEffortCtx"/>
+ <set-service-fields map="parameters" service-name="updateWorkEffort" to-map="updateWorkEffortCtx"/>
<!-- Maintenance WorkEffort entity -->
<call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/>
</simple-method>
<simple-method method-name="updateFixedAssetMaintAndWorkEffort" login-required="true"
short-description="Update FixedAssetMaint and Schedule information in WorkEffort">
- <set-service-fields map-name="parameters" service-name="updateFixedAssetMaint" to-map-name="updateFixedAssetMaintCtx"/>
+ <set-service-fields map="parameters" service-name="updateFixedAssetMaint" to-map="updateFixedAssetMaintCtx"/>
<call-service service-name="updateFixedAssetMaint" in-map-name="updateFixedAssetMaintCtx"/>
<check-errors/>
<if-compare field="parameters.statusId" operator="equals" value="FAM_CANCELLED">
<set field="updateWorkEffortCtx.currentStatusId" value="CAL_CANCELLED"/>
</if-compare>
- <set-service-fields map-name="parameters" service-name="updateWorkEffort" to-map-name="updateWorkEffortCtx"/>
+ <set-service-fields map="parameters" service-name="updateWorkEffort" to-map="updateWorkEffortCtx"/>
<set from-field="parameters.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/>
<set from-field="parameters.scheduleWorkEffortId" field="workEffortId"/>
<entity-one value-field="workEffort" entity-name="WorkEffort"/>
@@ -56,7 +56,7 @@
<simple-method method-name="createWorkEffortAndAssoc" login-required="true"
short-description="Create WorkEffort and Associate it with Parent (identified by workEffortFromId)">
<set from-field="parameters.workEffortIdTo" field="parameters.workEffortId"/>
- <set-service-fields map-name="parameters" service-name="createWorkEffortAndAssoc" to-map-name="createWorkEffortAndAssocCtx"/>
+ <set-service-fields map="parameters" service-name="createWorkEffortAndAssoc" to-map="createWorkEffortAndAssocCtx"/>
<call-service service-name="createWorkEffortAndAssoc" in-map-name="createWorkEffortAndAssocCtx"/>
<check-errors/>
</simple-method>
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 04:22:42 2008
@@ -199,7 +199,7 @@
<find-by-primary-key map="fileMap" value-field="mimeType" entity-name="FileExtension"/>
<!-- Create Data Resource -->
- <set-service-fields service-name="createContentFromUploadedFile" map-name="formInput.formInput" to-map-name="data"/>
+ <set-service-fields service-name="createContentFromUploadedFile" map="formInput.formInput" to-map="data"/>
<set field="data.dataResourceTypeId" value="LOCAL_FILE"/>
<set field="data.dataTemplateTypeId" value="NONE"/>
<set field="data.dataCategoryId" from-field="formInput.formInput.dataCategoryId"/>
@@ -216,7 +216,7 @@
<log level="always" message=" DataResource : ${parameters.dataResourceId}"></log>
<!-- Create attach upload to data resource -->
- <set-service-fields service-name="attachUploadToDataResource" map-name="formInput.formInput" to-map-name="attachMap"/>
+ <set-service-fields service-name="attachUploadToDataResource" map="formInput.formInput" to-map="attachMap"/>
<set field="attachMap.uploadedFile" from-field="formInput.imageData"/>
<set field="attachMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
<set field="attachMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
@@ -225,7 +225,7 @@
<call-service service-name="attachUploadToDataResource" in-map-name="attachMap"/>
<!-- Create content from dataResource -->
- <set-service-fields service-name="createContentFromDataResource" map-name="formInput.formInput" to-map-name="contentMap"/>
+ <set-service-fields service-name="createContentFromDataResource" map="formInput.formInput" to-map="contentMap"/>
<set field="contentMap.roleTypeId" from-field="formInput.formInput.roleTypeId"/>
<set field="contentMap.partyId" from-field="formInput.formInput.partyId"/>
<set field="contentMap.contentTypeId" from-field="formInput.formInput.contentTypeId"/>
@@ -236,14 +236,14 @@
<log level="always" message=" Content : ${parameters.contentId}"></log>
<!-- Create party content -->
- <set-service-fields service-name="createPartyContent" map-name="formInput.formInput" to-map-name="partycontent"/>
+ <set-service-fields service-name="createPartyContent" map="formInput.formInput" to-map="partycontent"/>
<set field="partycontent.contentId" from-field="parameters.contentId"/>
<set field="partycontent.partyContentTypeId" from-field="formInput.formInput.partyContentTypeId"/>
<set field="partycontent.partyId" from-field="formInput.formInput.partyId"/>
<call-service service-name="createPartyContent" in-map-name="partycontent"/>
<!-- Create communication event and content association -->
- <set-service-fields service-name="createCommEventContentAssoc" map-name="formInput.formInput" to-map-name="contentAssoc"/>
+ <set-service-fields service-name="createCommEventContentAssoc" map="formInput.formInput" to-map="contentAssoc"/>
<set field="contentAssoc.contentId" from-field="parameters.contentId"/>
<set field="contentAssoc.communicationEventId" from-field="formInput.formInput.communicationEventId"/>
<call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc">
@@ -268,14 +268,14 @@
</call-class-method>
<!-- Create party content -->
- <set-service-fields service-name="createPartyContent" map-name="formInput.formInput" to-map-name="partycontent"/>
+ <set-service-fields service-name="createPartyContent" map="formInput.formInput" to-map="partycontent"/>
<set field="partycontent.contentId" from-field="formInput.formInput.contentId"/>
<set field="partycontent.partyContentTypeId" from-field="formInput.formInput.partyContentTypeId"/>
<set field="partycontent.partyId" from-field="formInput.formInput.partyId"/>
<call-service service-name="createPartyContent" in-map-name="partycontent"/>
<!-- Create communication event and content association -->
- <set-service-fields service-name="createCommEventContentAssoc" map-name="formInput.formInput" to-map-name="contentAssoc"/>
+ <set-service-fields service-name="createCommEventContentAssoc" map="formInput.formInput" to-map="contentAssoc"/>
<set field="contentAssoc.contentId" from-field="formInput.formInput.contentId"/>
<set field="contentAssoc.communicationEventId" from-field="formInput.formInput.communicationEventId"/>
<call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc">
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 04:22:42 2008
@@ -51,7 +51,7 @@
<set field="parameters.userPrefMap.otherCommunications" value="N"/>
</else>
</if-compare>
- <set-service-fields service-name="setUserPreferenceGroup" map-name="parameters"
+ <set-service-fields service-name="setUserPreferenceGroup" map="parameters"
to-map-name="inMap"/>
<call-service service-name="setUserPreferenceGroup" in-map-name="inMap"/>
</simple-method>
@@ -64,7 +64,7 @@
<set field="parameters.userPrefMap.sendCustRequestEmail" value="N"/>
</else>
</if-compare>
- <set-service-fields service-name="setUserPreferenceGroup" map-name="parameters"
+ <set-service-fields service-name="setUserPreferenceGroup" map="parameters"
to-map-name="inMap"/>
<call-service service-name="setUserPreferenceGroup" in-map-name="inMap"/>
</simple-method>
@@ -226,7 +226,7 @@
<log level="always" message=" DataResource : ${parameters.dataResourceId}"/>
<!-- Create attach upload to data resource -->
- <set-service-fields service-name="attachUploadToDataResource" map-name="formInput.formInput"
+ <set-service-fields service-name="attachUploadToDataResource" map="formInput.formInput"
to-map-name="attachMap"/>
<set field="attachMap.uploadedFile" from-field="formInput.imageData"/>
<set field="attachMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
@@ -248,7 +248,7 @@
<log level="always" message=" Content : ${parameters.contentId}"/>
<!-- Create party content -->
- <set-service-fields service-name="createPartyContent" map-name="formInput.formInput"
+ <set-service-fields service-name="createPartyContent" map="formInput.formInput"
to-map-name="partycontent"/>
<set field="partycontent.contentId" from-field="parameters.contentId"/>
<set field="partycontent.partyContentTypeId"
@@ -286,7 +286,7 @@
</call-class-method>
<!-- Create party content -->
- <set-service-fields service-name="createPartyContent" map-name="formInput.formInput"
+ <set-service-fields service-name="createPartyContent" map="formInput.formInput"
to-map-name="partycontent"/>
<set field="partycontent.contentId" from-field="formInput.formInput.contentId"/>
<set field="partycontent.partyContentTypeId"
Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Tue Dec 30 04:22:42 2008
@@ -35,7 +35,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
<!--if-compare value="1" field-name="newEntity.confirmation" operator="equals" type="Integer">
- <set-service-fields to-map-name="oagisMessageErrorInfoMap" service-name="createOagisMessageErrorInfo" map-name="parameters"/>
+ <set-service-fields to-map="oagisMessageErrorInfoMap" service-name="createOagisMessageErrorInfo" map="parameters"/>
<call-service service-name="createOagisMessageErrorInfo" in-map-name="oagisMessageErrorInfoMap"/>
</if-compare-->
</simple-method>
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=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 04:22:42 2008
@@ -44,7 +44,7 @@
</simple-method>
<simple-method method-name="updateProject" short-description="Update a project">
- <set-service-fields service-name="updateWorkEffort" map-name="parameters" to-map-name="updWorkEffort"/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updWorkEffort"/>
<call-service service-name="updateWorkEffort" in-map-name="updWorkEffort"/>
<if-not-empty field="parameters.organizationPartyId">
<set field="updProjectRole.newPartyId" from-field="parameters.organizationPartyId"/>
@@ -1175,7 +1175,7 @@
</if-compare>
<else>
<if-compare field="hours" operator="not-equals" value="0">
- <set-service-fields service-name="createTimeEntry" map-name="parameters" to-map-name="teCreMap"/>
+ <set-service-fields service-name="createTimeEntry" map="parameters" to-map="teCreMap"/>
<set field="teCreMap.hours" from-field="hours"/>
<set field="teCreMap.fromDate" from-field="fromDate"/>
<call-service service-name="createTimeEntry" in-map-name="teCreMap"/>
@@ -1269,7 +1269,7 @@
<iterate entry="task" list="tasks">
<if-empty field="notFirst">
<!-- first time so create invoice -->
- <set-service-fields service-name="addWorkEffortTimeToNewInvoice" map-name="parameters" to-map-name="addTaskToNewInvoice"/>
+ <set-service-fields service-name="addWorkEffortTimeToNewInvoice" map="parameters" to-map="addTaskToNewInvoice"/>
<set field="addTaskToNewInvoice.workEffortId" from-field="task.workEffortId"/>
<set field="addTaskToNewInvoice.combineInvoiceItem" value="Y"/>
<set field="addTaskToNewInvoice.thruDate" from-field="parameters.thruDate"/>
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=730122&r1=730121&r2=730122&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 04:22:42 2008
@@ -20,12 +20,12 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="CreateCustRequestAndAssignTaskToPerson" short-description="">
- <set-service-fields service-name="createCustRequest" map-name="parameters" to-map-name="createCust"/>
+ <set-service-fields service-name="createCustRequest" map="parameters" to-map="createCust"/>
<call-service service-name="createCustRequest" in-map-name="createCust">
<result-to-field result-name="custRequestId" field-name="custRequestId"/>
</call-service>
<if-not-empty field="parameters.workEffortParentId">
- <set-service-fields service-name="createWorkEffort" map-name="parameters" to-map-name="createTask" />
+ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createTask" />
<set field="createTask.custRequestId" from-field="custRequestId"/>
<set field="createTask.workEffortName" from-field="parameters.custRequestName"/>
<call-service service-name="createWorkEffort" in-map-name="createTask" >
@@ -65,7 +65,7 @@
<set field="updCust.statusId" value="CRQ_REVIEWED"/>
<set field="updCust.custRequestId" from-field="parameters.custRequestId"/>
<call-service service-name="updateCustRequest" in-map-name="updCust"/>
- <set-service-fields service-name="createWorkEffortRequest" map-name="parameters" to-map-name="connectMap"/>
+ <set-service-fields service-name="createWorkEffortRequest" map="parameters" to-map="connectMap"/>
<call-service service-name="createWorkEffortRequest" in-map-name="connectMap"/>
</simple-method>
<simple-method method-name="setTaskStatusToComplete" short-description="Set the task status to complete, if resources assigned that status will also be set to complete">
@@ -83,19 +83,19 @@
<!-- if all assigns are complete the task will be set to complete -->
<if-not-empty field="assigns">
<iterate entry="assign" list="assigns">
- <set-service-fields service-name="updateTaskAssigment" map-name="assign" to-map-name="upd"/>
+ <set-service-fields service-name="updateTaskAssigment" map="assign" to-map="upd"/>
<set field="upd.statusId" value="PAS_COMPLETED"/>
<call-service service-name="updateTaskAssigment" in-map-name="upd"/>
</iterate>
<else>
- <set-service-fields service-name="updateWorkEffort" map-name="parameters" to-map-name="upd"/>
+ <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="upd"/>
<set field="upd.currentStatusId" value="PTS_COMPLETED"/>
<call-service service-name="updateWorkEffort" in-map-name="upd"/>
</else>
</if-not-empty>
</simple-method>
<simple-method method-name="addProjectMgrResource" short-description="make parties available in the project manager.">
- <set-service-fields service-name="createPartyRole" map-name="parameters" to-map-name="roleData"/>
+ <set-service-fields service-name="createPartyRole" map="parameters" to-map="roleData"/>
<call-service service-name="createPartyRole" in-map-name="roleData"/>
<set field="roleData.roleTypeId" value="PROJECT_TEAM"/>
<call-service service-name="createPartyRole" in-map-name="roleData"/>
@@ -109,7 +109,7 @@
<string value="dataResourceName"/>
</call-class-method>
- <set-service-fields service-name="createContentFromUploadedFile" map-name="formInput.formInput" to-map-name="inMap"/>
+ <set-service-fields service-name="createContentFromUploadedFile" map="formInput.formInput" to-map="inMap"/>
<set field="inMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
<set field="inMap.uploadedFile" from-field="formInput.imageData"/>
<set field="inMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
@@ -157,7 +157,7 @@
<entity-one entity-name="Content" value-field="content">
<field-map field-name="contentId" from-field="formInput.formInput.contentId"/>
</entity-one>
- <set-service-fields service-name="updateContentAndUploadedFile" map-name="formInput.formInput" to-map-name="inMap"/>
+ <set-service-fields service-name="updateContentAndUploadedFile" map="formInput.formInput" to-map="inMap"/>
<set field="inMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
<set field="inMap.uploadedFile" from-field="formInput.imageData"/>
<set field="inMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>