Author: jleroux
Date: Thu Jan 1 15:02:11 2009
New Revision: 730628
URL: http://svn.apache.org/viewvc?rev=730628&view=rev
Log:
<clone-value value-name => <clone-value value-field
<clone-value(.*)new-value-name => <clone-value$1new-value-field
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730628&r1=730627&r2=730628&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
Thu Jan 1 15:02:11 2009
@@ -209,7 +209,7 @@
<!-- only try to update content if the status is in process.... -->
<if-compare field="lookedUpValue.statusId" operator="equals"
value="INVOICE_IN_PROCESS">
- <clone-value value-name="lookedUpValue"
new-value-name="savedValue"/>
+ <clone-value value-field="lookedUpValue"
new-value-field="savedValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<!-- only save if something has changed, do not update status here
-->
@@ -286,7 +286,7 @@
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="InvoiceItem" map="lookupPKMap"
value-field="lookedUpValue"/>
- <clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
+ <clone-value value-field="lookedUpValue" new-value-field="savedValue"/>
<!-- set all parameters -->
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=730628&r1=730627&r2=730628&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
Thu Jan 1 15:02:11 2009
@@ -58,7 +58,7 @@
<find-by-primary-key entity-name="PaymentMethod" map="lookupPKMap"
value-field="lookedUpValue"/>
<if-compare field="lookedUpValue.paymentMethodTypeId"
operator="equals" value="CREDIT_CARD">
<find-by-primary-key entity-name="CreditCard" map="lookupPKMap"
value-field="mainValue"/>
- <clone-value value-name="mainValue" new-value-name="savedValue"/>
+ <clone-value value-field="mainValue" new-value-field="savedValue"/>
<set-nonpk-fields map="parameters" value-field="mainValue"/>
<if-compare-field field="mainValue" to-field="savedValue"
operator="not-equals" type="Object">
<store-value value-field="mainValue"/>
@@ -66,7 +66,7 @@
</if-compare>
<if-compare field="lookedUpValue.paymentMethodTypeId"
operator="equals" value="EFT_ACCOUNT">
<find-by-primary-key entity-name="CreditCard" map="lookupPKMap"
value-field="mainValue"/>
- <clone-value value-name="mainValue" new-value-name="savedValue"/>
+ <clone-value value-field="mainValue" new-value-field="savedValue"/>
<set-nonpk-fields map="parameters" value-field="mainValue"/>
<if-compare-field field="mainValue" to-field="savedValue"
operator="not-equals" type="Object">
<store-value value-field="mainValue"/>
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730628&r1=730627&r2=730628&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
(original)
+++
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
Thu Jan 1 15:02:11 2009
@@ -122,7 +122,7 @@
<log message="genInstanceChildCompDocs 1> contentAssocList:
${contentAssocList}" level="info"/>
<iterate list="contentAssocList" entry="templateContentAssoc">
- <clone-value value-name="templateContent"
new-value-name="instanceContent"/>
+ <clone-value value-field="templateContent"
new-value-field="instanceContent"/>
<sequenced-id sequence-name="Content"
field="instanceContent.contentId"/>
@@ -593,7 +593,7 @@
</entity-and>
<log level="info" message="templateContentApprovalList 0aa:
${templateContentApprovalList}"/>
<iterate list="templateContentApprovalList"
entry="templateContentApproval">
- <clone-value value-name="templateContentApproval"
new-value-name="contentApproval"/>
+ <clone-value value-field="templateContentApproval"
new-value-field="contentApproval"/>
<set from-field="parameters.contentRevisionSeqId"
field="contentApproval.contentRevisionSeqId"/>
<set from-field="parameters.contentId"
field="contentApproval.contentId"/>
@@ -647,7 +647,7 @@
</entity-and>
<log level="info" message="templateContentApprovalList 0aa:
${templateContentApprovalList}"/>
<iterate list="templateContentApprovalList"
entry="templateContentApproval">
- <clone-value value-name="templateContentApproval"
new-value-name="contentApproval"/>
+ <clone-value value-field="templateContentApproval"
new-value-field="contentApproval"/>
<set from-field="thisContentRevisionSeqId"
field="contentApproval.contentRevisionSeqId"/>
<set from-field="thisContentId"
field="contentApproval.contentId"/>
@@ -670,7 +670,7 @@
<log level="info" message="cloneContentApprovals(2b)-
contentApprovalList : ${contentApprovalList} "/>
<!-- conditionally set the contentApprovalId status of each
entity -->
<iterate list="contentApprovalList"
entry="existingContentApproval">
- <clone-value value-name="existingContentApproval"
new-value-name="contentApproval"/>
+ <clone-value value-field="existingContentApproval"
new-value-field="contentApproval"/>
<set from-field="thisContentRevisionSeqId"
field="contentApproval.contentRevisionSeqId"/>
<sequenced-id sequence-name="ContentApproval"
field="contentApproval.contentApprovalId"/>
@@ -749,7 +749,7 @@
</condition-list>
</entity-condition>
<if-empty field="newContentApprovalList">
- <clone-value value-name="templateContentApproval"
new-value-name="contentApproval"/>
+ <clone-value value-field="templateContentApproval"
new-value-field="contentApproval"/>
<set from-field="thisContentRevisionSeqId"
field="contentApproval.contentRevisionSeqId"/>
<set field="contentApproval.contentId"
from-field="thisContentId"/>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730628&r1=730627&r2=730628&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
Thu Jan 1 15:02:11 2009
@@ -39,7 +39,7 @@
<make-value value-field="lookupPKMap" entity-name="Requirement"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key entity-name="Requirement" map="lookupPKMap"
value-field="lookedUpValue"/>
- <clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
+ <clone-value value-field="lookedUpValue" new-value-field="savedValue"/>
<field-to-result field="lookedUpValue.statusId"
result-name="oldStatusId"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<store-value value-field="lookedUpValue"/>
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730628&r1=730627&r2=730628&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
(original)
+++
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
Thu Jan 1 15:02:11 2009
@@ -66,7 +66,7 @@
<find-by-primary-key entity-name="ContactMech" map="ContactMechMap"
value-field="oldValue" />
<if-compare-field to-field="oldValue.infoString"
field="parameters.infoString" operator="not-equals">
<log level="info" message="Contact mech need updating"/>
- <clone-value value-name="oldValue" new-value-name="newValue"/>
+ <clone-value value-field="oldValue" new-value-field="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"
set-if-null="false"/>
<set field="context.contactMechTypeId"
from-field="parameters.contactMechTypeId"/>
<set field="context.infoString"
from-field="parameters.infoString"/>
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730628&r1=730627&r2=730628&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
(original)
+++
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
Thu Jan 1 15:02:11 2009
@@ -86,7 +86,7 @@
<check-errors/>
- <clone-value value-name="partyContactMech"
new-value-name="newPartyContactMech"/>
+ <clone-value value-field="partyContactMech"
new-value-field="newPartyContactMech"/>
<!-- If we already have a new contactMechId don't update ContactMech
-->
<if-empty field="parameters.newContactMechId">
@@ -111,7 +111,7 @@
<if-compare-field to-field="newPartyContactMech.contactMechId"
field="parameters.contactMechId" operator="not-equals">
<get-related value-field="partyContactMech"
relation-name="PartyContactMechPurpose" list="partyContactMechPurposes"/>
<iterate entry="partyContactMechPurposeOld"
list="partyContactMechPurposes">
- <clone-value value-name="partyContactMechPurposeOld"
new-value-name="partyContactMechPurpose"/>
+ <clone-value value-field="partyContactMechPurposeOld"
new-value-field="partyContactMechPurpose"/>
<now-timestamp field="partyContactMechPurposeOld.thruDate"/>
<store-value value-field="partyContactMechPurposeOld"/>
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=730628&r1=730627&r2=730628&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
Thu Jan 1 15:02:11 2009
@@ -371,7 +371,7 @@
<!-- add each to a list to store and then store all and let the entity
engine do inserts or updates as needed; much more reliable/useful -->
<iterate entry="productCategoryMember" list="productCategoryMembers">
- <clone-value value-name="productCategoryMember"
new-value-name="newProductCategoryMember"/>
+ <clone-value value-field="productCategoryMember"
new-value-field="newProductCategoryMember"/>
<set field="newProductCategoryMember.productCategoryId"
from-field="parameters.productCategoryIdTo"/>
<field-to-list field="newProductCategoryMember"
list="pcmsToStore"/>
</iterate>
@@ -423,7 +423,7 @@
<!-- add each to a list to store and then store all and let the entity
engine do inserts or updates as needed; much more reliable/useful -->
<iterate entry="categoryEntity" list="categoryEntities">
- <clone-value value-name="categoryEntity"
new-value-name="newCategoryEntity"/>
+ <clone-value value-field="categoryEntity"
new-value-field="newCategoryEntity"/>
<set field="newCategoryEntity.productCategoryId"
from-field="productCategoryIdTo"/>
<field-to-list field="newCategoryEntity" list="entitiesToStore"/>
</iterate>
@@ -563,7 +563,7 @@
<entity-one entity-name="ProductCategory" value-field="oldCategory">
<field-map field-name="productCategoryId"
from-field="parameters.oldProductCategoryId"/>
</entity-one>
- <clone-value value-name="oldCategory" new-value-name="newCategory"/>
+ <clone-value value-field="oldCategory" new-value-field="newCategory"/>
<!-- set the new product category id, and write it to the datasource
-->
<set field="newCategory.productCategoryId"
from-field="parameters.productCategoryId"/>
@@ -603,7 +603,7 @@
<if-not-empty field="parameters.duplicateParentRollup">
<find-by-and entity-name="ProductCategoryRollup"
map="categoryFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
- <clone-value value-name="foundValue"
new-value-name="newTempValue"/>
+ <clone-value value-field="foundValue"
new-value-field="newTempValue"/>
<set field="newTempValue.productCategoryId"
from-field="parameters.productCategoryId"/>
<create-value value-field="newTempValue"/>
</iterate>
@@ -613,7 +613,7 @@
<field-map field-name="parentProductCategoryId"
from-field="parameters.oldProductCategoryId"/>
</entity-and>
<iterate entry="foundValue" list="foundValues">
- <clone-value value-name="foundValue"
new-value-name="newTempValue"/>
+ <clone-value value-field="foundValue"
new-value-field="newTempValue"/>
<set field="newTempValue.parentProductCategoryId"
from-field="parameters.productCategoryId"/>
<create-value value-field="newTempValue"/>
</iterate>
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=730628&r1=730627&r2=730628&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
Thu Jan 1 15:02:11 2009
@@ -68,7 +68,7 @@
<check-errors/>
<log message="parameters: ${parameters}" level="info"/>
- <clone-value value-name="facilityContactMech"
new-value-name="newFacilityContactMech"/>
+ <clone-value value-field="facilityContactMech"
new-value-field="newFacilityContactMech"/>
<log message="parameters: ${parameters}" level="info"/>
<!-- If we already have a new contactMechId don't update ContactMech
-->
<if-empty field="parameters.newContactMechId">
@@ -96,7 +96,7 @@
<if-compare-field to-field="newFacilityContactMech.contactMechId"
field="parameters.contactMechId" operator="not-equals">
<get-related value-field="facilityContactMech"
relation-name="FacilityContactMechPurpose" list="facilityContactMechPurposes"/>
<iterate entry="facilityContactMechPurposeOld"
list="facilityContactMechPurposes">
- <clone-value value-name="facilityContactMechPurposeOld"
new-value-name="facilityContactMechPurpose"/>
+ <clone-value value-field="facilityContactMechPurposeOld"
new-value-field="facilityContactMechPurpose"/>
<now-timestamp field="facilityContactMechPurposeOld.thruDate"/>
<store-value value-field="facilityContactMechPurposeOld"/>
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=730628&r1=730627&r2=730628&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
Thu Jan 1 15:02:11 2009
@@ -624,7 +624,7 @@
<entity-one entity-name="Shipment" value-field="shipment"/>
- <clone-value value-name="shipment" new-value-name="shipmentCopy"/>
+ <clone-value value-field="shipment" new-value-field="shipmentCopy"/>
<string-to-list string="-fromDate"
list-name="descendingFromDateOrder"/>
<if-not-empty field="shipment.originFacilityId">
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=730628&r1=730627&r2=730628&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
Thu Jan 1 15:02:11 2009
@@ -113,7 +113,7 @@
</if-empty>-->
<entity-one entity-name="WorkEffort" value-field="lookedUpValue"/>
- <clone-value value-name="lookedUpValue" new-value-field="savedValue"/>
+ <clone-value value-field="lookedUpValue" new-value-field="savedValue"/>
<now-timestamp field="nowTimestamp"/>
@@ -355,7 +355,7 @@
</if-empty>
<check-errors/>
- <clone-value value-name="workEffortContactMech"
new-value-name="newWorkEffortContactMech"/>
+ <clone-value value-field="workEffortContactMech"
new-value-field="newWorkEffortContactMech"/>
<!-- If we already have a new contactMechId don't update ContactMech
-->
<if-empty field="parameters.newContactMechId">
@@ -1117,7 +1117,7 @@
<entity-one entity-name="WorkEffort" value-field="oldWorkEffort">
<field-map field-name="workEffortId"
from-field="parameters.oldWorkEffortId"/>
</entity-one>
- <clone-value value-name="oldWorkEffort"
new-value-name="newWorkEffort"/>
+ <clone-value value-field="oldWorkEffort"
new-value-field="newWorkEffort"/>
<!-- set the workEffortId, and write it to the datasource -->
<set from-field="parameters.workEffortId"
field="newWorkEffort.workEffortId"/>
@@ -1129,7 +1129,7 @@
<if-not-empty field="parameters.duplicateWorkEffortAssocs">
<find-by-and entity-name="WorkEffortAssoc"
map="workEffortAssocFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
- <clone-value value-name="foundValue"
new-value-name="newTempValue"/>
+ <clone-value value-field="foundValue"
new-value-field="newTempValue"/>
<set from-field="parameters.workEffortId"
field="newTempValue.workEffortIdFrom"/>
<create-value value-field="newTempValue"/>
</iterate>
@@ -1137,7 +1137,7 @@
<field-map field-name="workEffortIdTo"
from-field="parameters.oldWorkEffortId"/>
</entity-and>
<iterate entry="foundValue" list="foundValues">
- <clone-value value-name="foundValue"
new-value-name="newTempValue"/>
+ <clone-value value-field="foundValue"
new-value-field="newTempValue"/>
<set from-field="parameters.workEffortId"
field="newTempValue.workEffortIdTo"/>
<create-value value-field="newTempValue"/>
</iterate>
@@ -1149,7 +1149,7 @@
<if-not-empty field="parameters.duplicateWorkEffortNotes">
<find-by-and entity-name="WorkEffortNote"
map="workEffortFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
- <clone-value value-name="foundValue"
new-value-name="newTempValue"/>
+ <clone-value value-field="foundValue"
new-value-field="newTempValue"/>
<set from-field="parameters.workEffortId"
field="newTempValue.workEffortId"/>
<create-value value-field="newTempValue"/>
</iterate>
@@ -1157,7 +1157,7 @@
<if-not-empty field="parameters.duplicateWorkEffortContents">
<find-by-and entity-name="WorkEffortContent"
map="workEffortFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
- <clone-value value-name="foundValue"
new-value-name="newTempValue"/>
+ <clone-value value-field="foundValue"
new-value-field="newTempValue"/>
<set from-field="parameters.workEffortId"
field="newTempValue.workEffortId"/>
<create-value value-field="newTempValue"/>
</iterate>
@@ -1166,7 +1166,7 @@
<find-by-and entity-name="RateAmount" map="workEffortFindContext"
list="foundValuesAll"/>
<filter-list-by-date list="foundValuesAll" to-list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
- <clone-value value-name="foundValue"
new-value-name="newTempValue"/>
+ <clone-value value-field="foundValue"
new-value-field="newTempValue"/>
<set from-field="parameters.workEffortId"
field="newTempValue.workEffortId"/>
<create-value value-field="newTempValue"/>
</iterate>
