Author: jacopoc
Date: Sat Oct 21 07:11:55 2006
New Revision: 466401
URL: http://svn.apache.org/viewvc?view=rev&rev=466401
Log:
converted deprecated minilang operations to the set operation.
Modified:
incubator/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
Modified:
incubator/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?view=diff&rev=466401&r1=466400&r2=466401
==============================================================================
---
incubator/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
Sat Oct 21 07:11:55 2006
@@ -35,9 +35,9 @@
<if-not-empty field-name="component.productId">
<clear-field field-name="callSvcMap"/>
<set-service-fields to-map-name="callSvcMap"
service-name="issueProductionRunTaskComponent" map-name="component"/>
- <env-to-env env-name="workEffort"
to-env-name="callSvcMap.workEffort"/>
- <env-to-env env-name="component"
to-env-name="callSvcMap.workEffortGoodStandard"/>
- <env-to-env env-name="reserveOrderEnumId"
to-env-name="callSvcMap.reserveOrderEnumId"/>
+ <set from-field="workEffort"
field="callSvcMap.workEffort"/>
+ <set from-field="component"
field="callSvcMap.workEffortGoodStandard"/>
+ <set from-field="reserveOrderEnumId"
field="callSvcMap.reserveOrderEnumId"/>
<call-service
service-name="issueProductionRunTaskComponent" in-map-name="callSvcMap"/>
</if-not-empty>
</iterate>
@@ -50,7 +50,7 @@
<set field="parameters.workEffortGoodStdTypeId"
value="PRUNT_PROD_NEEDED"/>
<entity-one entity-name="WorkEffortGoodStandard"
value-name="workEffortGoodStandard"/>
<else>
- <env-to-env env-name="parameters.workEffortGoodStandard"
to-env-name="workEffortGoodStandard"/>
+ <set from-field="parameters.workEffortGoodStandard"
field="workEffortGoodStandard"/>
</else>
</if-empty>
@@ -62,7 +62,7 @@
<if-empty field-name="parameters.workEffort">
<entity-one entity-name="WorkEffort" value-name="workEffort"/>
<else>
- <env-to-env env-name="parameters.workEffort"
to-env-name="workEffort"/>
+ <set from-field="parameters.workEffort" field="workEffort"/>
</else>
</if-empty>
@@ -86,11 +86,11 @@
</else>
</if-compare>
<field-to-list field-name="orderByString" list-name="orderByList"/>
- <env-to-env env-name="workEffortGoodStandard.productId"
to-env-name="lookupFieldMap.productId"/>
- <env-to-env env-name="workEffort.facilityId"
to-env-name="lookupFieldMap.facilityId"/>
+ <set from-field="workEffortGoodStandard.productId"
field="lookupFieldMap.productId"/>
+ <set from-field="workEffort.facilityId"
field="lookupFieldMap.facilityId"/>
<find-by-and entity-name="InventoryItem" map-name="lookupFieldMap"
list-name="inventoryItemList" order-by-list-name="orderByList"/>
- <env-to-env env-name="workEffortGoodStandard.estimatedQuantity"
to-env-name="parameters.quantityNotIssued"/>
+ <set from-field="workEffortGoodStandard.estimatedQuantity"
field="parameters.quantityNotIssued"/>
<iterate entry-name="inventoryItem" list-name="inventoryItemList">
<!-- this is a little trick to get the InventoryItem value
object without doing a query, possible since all fields on InventoryItem are
also on InventoryItemAndLocation with the same names -->
@@ -103,14 +103,14 @@
<!-- create ItemIssuance record -->
<set from-field="parameters.workEffortId"
field="issuanceCreateMap.workEffortId"/>
<set from-field="lastNonSerInventoryItem.inventoryItemId"
field="issuanceCreateMap.inventoryItemId"/>
- <env-to-env env-name="parameters.quantityNotIssued"
to-env-name="issuanceCreateMap.quantity"/>
+ <set from-field="parameters.quantityNotIssued"
field="issuanceCreateMap.quantity"/>
<call-service service-name="assignInventoryToWorkEffort"
in-map-name="issuanceCreateMap">
</call-service>
<!-- subtract from quantityNotIssued from the
availableToPromise and quantityOnHand of existing inventory item -->
<!-- instead of updating InventoryItem, add an
InventoryItemDetail -->
- <env-to-env
env-name="lastNonSerInventoryItem.inventoryItemId"
to-env-name="createDetailMap.inventoryItemId"/>
- <env-to-env env-name="parameters.workEffortId"
to-env-name="createDetailMap.workEffortId"/>
+ <set from-field="lastNonSerInventoryItem.inventoryItemId"
field="createDetailMap.inventoryItemId"/>
+ <set from-field="parameters.workEffortId"
field="createDetailMap.workEffortId"/>
<calculate
field-name="createDetailMap.availableToPromiseDiff" type="Double">
<calcop field-name="parameters.quantityNotIssued"
operator="negative"/>
</calculate>
@@ -199,8 +199,8 @@
</call-service>
<!-- instead of updating InventoryItem, add an
InventoryItemDetail -->
- <env-to-env env-name="inventoryItem.inventoryItemId"
to-env-name="createDetailMap.inventoryItemId"/>
- <env-to-env env-name="parameters.workEffortId"
to-env-name="createDetailMap.workEffortId"/>
+ <set from-field="inventoryItem.inventoryItemId"
field="createDetailMap.inventoryItemId"/>
+ <set from-field="parameters.workEffortId"
field="createDetailMap.workEffortId"/>
<!-- update availableToPromiseDiff AND
quantityOnHandDiff since this is an issuance -->
<calculate
field-name="createDetailMap.availableToPromiseDiff" type="Double">
<calcop field-name="parameters.deductAmount"
operator="negative"/>
@@ -223,7 +223,7 @@
<!-- keep track of the last non-serialized inventory item for
use if inventory is not sufficient for amount already issued -->
<!-- use env variable named lastNonSerInventoryItem -->
- <env-to-env env-name="inventoryItem"
to-env-name="lastNonSerInventoryItem"/>
+ <set from-field="inventoryItem"
field="lastNonSerInventoryItem"/>
</if-compare>
</if-compare>
</simple-method>
Modified:
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?view=diff&rev=466401&r1=466400&r2=466401
==============================================================================
---
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
Sat Oct 21 07:11:55 2006
@@ -27,9 +27,7 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- MarketingCampaign uses a sequenced id, so get the next one now
and set it... -->
- <sequenced-id-to-env sequence-name="MarketingCampaign"
env-name="newSequencedId"/>
- <to-string field-name="newSequencedId"/>
- <env-to-field env-name="newSequencedId"
field-name="marketingCampaignId" map-name="newEntity"/>
+ <sequenced-id-to-env sequence-name="MarketingCampaign"
env-name="newEntity.marketingCampaignId"/>
<create-value value-name="newEntity"/>
Modified:
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?view=diff&rev=466401&r1=466400&r2=466401
==============================================================================
---
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
Sat Oct 21 07:11:55 2006
@@ -166,7 +166,7 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<now-timestamp-to-env env-name="newEntity.statusDate"/>
- <env-to-env env-name="userLogin.userLoginId"
to-env-name="newEntity.setByUserLoginId"/>
+ <set from-field="userLogin.userLoginId"
field="newEntity.setByUserLoginId"/>
<!-- if statusId is CLPT_PENDING, set optInVerifyCode; else if
statusId is CLPT_ACCEPTED, make sure optInVerifyCode is the same as the last
CLPT_PENDING -->
<if>
@@ -252,16 +252,16 @@
<!-- TODO: if preferredContactMech is empty, should we try to
find the ContactMech we want based on the Party? -->
<!-- TODO: this could really use some more work to be more
flexible, or easier to maintain, like perhaps a general EmailSendSettings
entity or something -->
- <env-to-env env-name="preferredContactMech.infoString"
to-env-name="sendMailFromScreenMap.sendTo"/>
- <env-to-env env-name="contactList.verifyEmailFrom"
to-env-name="sendMailFromScreenMap.sendFrom"/>
- <env-to-env env-name="contactList.verifyEmailSubject"
to-env-name="sendMailFromScreenMap.subject"/>
- <env-to-env env-name="contactList.verifyEmailScreen"
to-env-name="sendMailFromScreenMap.bodyScreenUri"/>
- <env-to-env env-name="contactList.verifyEmailWebSiteId"
to-env-name="sendMailFromScreenMap.webSiteId"/>
- <string-to-field string="text/html"
field-name="sendMailFromScreenMap.contentType"/>
+ <set from-field="preferredContactMech.infoString"
field="sendMailFromScreenMap.sendTo"/>
+ <set from-field="contactList.verifyEmailFrom"
field="sendMailFromScreenMap.sendFrom"/>
+ <set from-field="contactList.verifyEmailSubject"
field="sendMailFromScreenMap.subject"/>
+ <set from-field="contactList.verifyEmailScreen"
field="sendMailFromScreenMap.bodyScreenUri"/>
+ <set from-field="contactList.verifyEmailWebSiteId"
field="sendMailFromScreenMap.webSiteId"/>
+ <set value="text/html"
field="sendMailFromScreenMap.contentType"/>
- <env-to-env env-name="contactList"
to-env-name="sendMailFromScreenMap.bodyParameters.contactList"/>
- <env-to-env env-name="contactListParty"
to-env-name="sendMailFromScreenMap.bodyParameters.contactListParty"/>
- <env-to-env env-name="contactListPartyStatus"
to-env-name="sendMailFromScreenMap.bodyParameters.contactListPartyStatus"/>
+ <set from-field="contactList"
field="sendMailFromScreenMap.bodyParameters.contactList"/>
+ <set from-field="contactListParty"
field="sendMailFromScreenMap.bodyParameters.contactListParty"/>
+ <set from-field="contactListPartyStatus"
field="sendMailFromScreenMap.bodyParameters.contactListPartyStatus"/>
<call-service service-name="sendMailFromScreen"
in-map-name="sendMailFromScreenMap"/>
</then>
Modified:
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?view=diff&rev=466401&r1=466400&r2=466401
==============================================================================
---
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
Sat Oct 21 07:11:55 2006
@@ -30,10 +30,10 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<!-- set the history/audit info -->
- <field-to-field field-name="userLoginId" map-name="userLogin"
to-field-name="createdByUserLogin" to-map-name="newEntity"/>
- <env-to-field env-name="nowStamp" field-name="createdDate"
map-name="newEntity"/>
- <field-to-field field-name="userLoginId" map-name="userLogin"
to-field-name="lastModifiedByUserLogin" to-map-name="newEntity"/>
- <env-to-field env-name="lastModifiedDate" field-name="createdDate"
map-name="newEntity"/>
+ <set from-field="userLogin.userLoginId"
field="newEntity.createdByUserLogin"/>
+ <set from-field="nowStamp" field="newEntity.createdDate"/>
+ <set from-field="userLogin.userLoginId"
field="newEntity.lastModifiedByUserLogin"/>
+ <set from-field="lastModifiedDate" field="newEntity.createdDate"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -49,8 +49,8 @@
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<!-- set the history/audit info -->
- <field-to-field field-name="userLoginId" map-name="userLogin"
to-field-name="lastModifiedByUserLogin" to-map-name="newEntity"/>
- <env-to-field env-name="lastModifiedDate" field-name="createdDate"
map-name="newEntity"/>
+ <set from-field="userLogin.userLoginId"
field="newEntity.lastModifiedByUserLogin"/>
+ <set from-field="lastModifiedDate" field="newEntity.createdDate"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
@@ -75,8 +75,7 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<!-- set the history/audit info -->
- <env-to-field env-name="nowStamp" field-name="createdStamp"
map-name="newEntity"/>
- <env-to-field env-name="lastModifiedDate" field-name="createdStamp"
map-name="newEntity"/>
+ <set from-field="nowStamp" field="newEntity.createdStamp"/>
<create-value value-name="newEntity"/>
</simple-method>
@@ -90,9 +89,6 @@
<set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
<find-by-primary-key entity-name="TrackingCodeType"
map-name="lookupPKMap" value-name="lookedUpValue"/>
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
-
- <!-- set the history/audit info -->
- <env-to-field env-name="lastModifiedDate" field-name="createdStamp"
map-name="newEntity"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
