Author: jacopoc
Date: Sat Oct 21 07:34:11 2006
New Revision: 466405
URL: http://svn.apache.org/viewvc?view=rev&rev=466405
Log:
converted deprecated minilang operations to the set operation.
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxRateServices.xml
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?view=diff&rev=466405&r1=466404&r2=466405
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
Sat Oct 21 07:34:11 2006
@@ -22,8 +22,8 @@
<!-- permission checking is done in the services definition file
(services_other.xml) -->
<!-- check that the party is an INTERNAL_ORGANIZATION, as defined in
PartyRole -->
- <field-to-field field-name="partyId" map-name="parameters"
to-map-name="lookupParams"/>
- <string-to-field string="INTERNAL_ORGANIZATIO" field-name="roleTypeId"
map-name="lookupParams"/>
+ <set from-field="parameters.partyId" field="lookupParams.partyId"/>
+ <set value="INTERNAL_ORGANIZATIO" field="lookupParams.roleTypeId"/>
<find-by-primary-key use-cache="true" entity-name="PartyRole"
value-name="partyRole" map-name="lookupParams"/>
<if-empty field-name="partyRole">
<add-error><fail-property resource="AccountingUiLabels"
property="AccountingPartyMustBeInternalOrganization"/></add-error>
@@ -44,7 +44,7 @@
<if-empty field-name="parameters.asOfTimestamp">
<now-timestamp-to-env env-name="nowTimestamp"/>
<else>
- <field-to-env field-name="parameters.asOfTimestamp"
env-name="nowTimestamp"/>
+ <set from-field="parameters.asOfTimestamp" field="nowTimestamp"/>
</else>
</if-empty>
@@ -57,13 +57,13 @@
<!-- expire all of them -->
<iterate list-name="uomConversions" entry-name="uomConversion">
- <env-to-field env-name="nowTimestamp" field-name="thruDate"
map-name="uomConversion"/>
+ <set from-field="nowTimestamp" field="uomConversion.thruDate"/>
</iterate>
<store-list list-name="uomConversions"/>
<!-- now create a new conversion relationship -->
<set-service-fields to-map-name="createParams"
service-name="createUomConversionDated" map-name="parameters"/>
- <env-to-field env-name="nowTimestamp" field-name="fromDate"
map-name="createParams"/>
+ <set from-field="nowTimestamp" field="createParams.fromDate"/>
<call-service service-name="createUomConversionDated"
in-map-name="createParams"/>
</simple-method>
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?view=diff&rev=466405&r1=466404&r2=466405
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
Sat Oct 21 07:34:11 2006
@@ -36,12 +36,12 @@
<!-- create a non existing ID -->
<sequenced-id-to-env sequence-name="Agreement" env-name="agreementId"/>
- <env-to-field env-name="agreementId" map-name="newEntity"/>
+ <set from-field="agreementId" field="newEntity.agreementId"/>
<field-to-result field-name="agreementId" result-name="agreementId"/>
<if-empty field-name="fromDate" map-name="newEntity">
<now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="fromDate"
map-name="newEntity"/>
+ <set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
<!-- finally create the record (should not exist already)-->
@@ -73,7 +73,7 @@
<entity-one entity-name="Agreement" value-name="agreement"
auto-field-map="true"/>
<check-errors/>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="thruDate"
map-name="agreement"/>
+ <set from-field="nowTimestamp" field="agreement.thruDate"/>
<store-value value-name="agreement"/>
<check-errors/>
</simple-method>
@@ -90,7 +90,7 @@
<make-value value-name="newEntity" entity-name="AgreementItem"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <field-to-field field-name="parameters.agreementId"
to-field-name="newEntity.agreementId"/>
+ <set from-field="parameters.agreementId"
field="newEntity.agreementId"/>
<!-- create a non existing ID -->
<if-empty field-name="parameters.agreementItemSeqId">
<make-next-seq-id value-name="newEntity"
seq-field-name="agreementItemSeqId"/>
@@ -147,9 +147,9 @@
<!-- create a non existing ID -->
<sequenced-id-to-env sequence-name="AgreementTerm"
env-name="agreementTermId"/>
- <field-to-field field-name="parameters.agreementId"
to-field-name="newEntity.agreementId"/>
- <field-to-field field-name="parameters.agreementItemSeqId"
to-field-name="newEntity.agreementItemSeqId"/>
- <env-to-field env-name="agreementTermId" map-name="newEntity"/>
+ <set from-field="parameters.agreementId"
field="newEntity.agreementId"/>
+ <set from-field="parameters.agreementItemSeqId"
field="newEntity.agreementItemSeqId"/>
+ <set from-field="agreementTermId" field="newEntity.agreementTermId"/>
<field-to-result field-name="agreementTermId"
result-name="agreementTermId"/>
<!-- finally create the record (should not exist already)-->
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml?view=diff&rev=466405&r1=466404&r2=466405
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
Sat Oct 21 07:34:11 2006
@@ -23,7 +23,7 @@
<check-errors/>
<make-value entity-name="CostComponentCalc" value-name="newEntity"/>
<sequenced-id-to-env sequence-name="CostComponentCalc"
env-name="costComponentCalcId"/>
- <env-to-field env-name="costComponentCalcId" map-name="newEntity"/>
+ <set from-field="costComponentCalcId"
field="newEntity.costComponentCalcId"/>
<field-to-result field-name="costComponentCalcId"
result-name="costComponentCalcId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<create-value value-name="newEntity"/>
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?view=diff&rev=466405&r1=466404&r2=466405
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
Sat Oct 21 07:34:11 2006
@@ -26,7 +26,7 @@
<if-empty field-name="finAccountId" map-name="newEntity">
<sequenced-id-to-env sequence-name="FinAccount"
env-name="finAccountId"/>
<to-string field-name="finAccountId"/>
- <env-to-field env-name="finAccountId" map-name="newEntity"/>
+ <set from-field="finAccountId" field="newEntity.finAccountId"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -34,7 +34,7 @@
</simple-method>
<simple-method method-name="updateFinAccount" short-description="Update a
Financial Account">
- <field-to-field field-name="finAccountId" map-name="parameters"
to-map-name="lookupPkMap"/>
+ <set from-field="parameters.finAccountId"
field="lookupPkMap.finAccountId"/>
<find-by-primary-key map-name="lookupPkMap" value-name="finAccount"
entity-name="FinAccount"/>
<set-nonpk-fields map-name="parameters" value-name="finAccount"/>
@@ -43,7 +43,7 @@
</simple-method>
<simple-method method-name="removeFinAccount" short-description="Remove a
Financial Account">
- <field-to-field field-name="finAccountId" map-name="parameters"
to-map-name="lookupPkMap"/>
+ <set from-field="parameters.finAccountId"
field="lookupPkMap.finAccountId"/>
<find-by-primary-key map-name="lookupPkMap" value-name="finAccount"
entity-name="FinAccount"/>
<remove-value value-name="finAccount"/>
@@ -55,14 +55,14 @@
<sequenced-id-to-env sequence-name="FinAccountTrans"
env-name="finAccountTransId"/>
<to-string field-name="finAccountTransId"/>
- <env-to-field env-name="finAccountTransId" map-name="newEntity"/>
+ <set from-field="finAccountTransId"
field="newEntity.finAccountTransId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
<if-empty field-name="transactionDate" map-name="newEntity">
- <env-to-field env-name="nowTimestamp" field-name="transactionDate"
map-name="newEntity"/>
+ <set from-field="nowTimestamp" field="newEntity.transactionDate"/>
</if-empty>
<if-empty field-name="entryDate" map-name="newEntity">
- <env-to-field env-name="nowTimestamp" field-name="entryDate"
map-name="newEntity"/>
+ <set from-field="nowTimestamp" field="newEntity.entryDate"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -76,7 +76,7 @@
<if-empty field-name="fromDate" map-name="newEntity">
<now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="fromDate"
map-name="newEntity"/>
+ <set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -105,14 +105,14 @@
<sequenced-id-to-env sequence-name="FinAccountAuth"
env-name="finAccountAuthId"/>
<to-string field-name="finAccountAuthId"/>
- <env-to-field env-name="finAccountAuthId" map-name="newEntity"/>
+ <set from-field="finAccountAuthId" field="newEntity.finAccountAuthId"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
<if-empty field-name="authorizationDate" map-name="newEntity">
- <env-to-field env-name="nowTimestamp"
field-name="authorizationDate" map-name="newEntity"/>
+ <set from-field="nowTimestamp"
field="newEntity.authorizationDate"/>
</if-empty>
<if-empty field-name="fromDate" map-name="newEntity">
- <env-to-field env-name="nowTimestamp" field-name="fromDate"
map-name="newEntity"/>
+ <set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
<create-value value-name="newEntity"/>
<field-to-result field-name="finAccountAuthId"
result-name="finAccountAuthId"/>
@@ -124,9 +124,9 @@
<if-empty field-name="parameters.expireDateTime">
<now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="thruDate"
map-name="finAccountAuth"/>
+ <set from-field="nowTimestamp" field="finAccountAuth.thruDate"/>
<else>
- <field-to-field field-name="parameters.expireDatetime"
to-field-name="finAccountAuth.thruDate"/>
+ <set from-field="parameters.expireDatetime"
field="finAccountAuth.thruDate"/>
</else>
</if-empty>
<store-value value-name="finAccountAuth"/>
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml?view=diff&rev=466405&r1=466404&r2=466405
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
Sat Oct 21 07:34:11 2006
@@ -26,12 +26,12 @@
<sequenced-id-to-env sequence-name="BillingAccount"
env-name="billingAccountId"/>
<to-string field-name="billingAccountId"/>
- <env-to-field env-name="billingAccountId" map-name="newEntity"/>
+ <set from-field="billingAccountId" field="newEntity.billingAccountId"/>
<field-to-result field-name="billingAccountId"
result-name="billingAccountId"/>
<if-empty field-name="fromDate" map-name="newEntity">
<now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="fromDate"
map-name="newEntity"/>
+ <set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -55,7 +55,7 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field-name="fromDate" map-name="newEntity">
<now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="fromDate"
map-name="newEntity"/>
+ <set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
<create-value value-name="newEntity"/>
</simple-method>
@@ -87,7 +87,7 @@
<sequenced-id-to-env sequence-name="BillingAccountTerm"
env-name="billingAccountTermId"/>
<to-string field-name="billingAccountTermId"/>
- <env-to-field env-name="billingAccountTermId" map-name="newEntity"/>
+ <set from-field="billingAccountTermId"
field="newEntity.billingAccountTermId"/>
<field-to-result field-name="billingAccountTermId"
result-name="billingAccountTermId"/>
<create-value value-name="newEntity"/>
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml?view=diff&rev=466405&r1=466404&r2=466405
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml
Sat Oct 21 07:34:11 2006
@@ -36,9 +36,9 @@
<result-to-request result-name="paymentMethodId"/>
</call-service>
<if-compare map-name="parameters" field-name="contactMechId"
operator="equals" value="_NEW_">
- <string-to-field string="address" field-name="_response_code_"/>
- <string-to-field string="POSTAL_ADDRESS"
field-name="preContactMechTypeId"/>
- <string-to-field string="BILLING_LOCATION"
field-name="contactMechPurposeTypeId"/>
+ <set value="address" field="_response_code_"/>
+ <set value="POSTAL_ADDRESS" field="preContactMechTypeId"/>
+ <set value="BILLING_LOCATION" field="contactMechPurposeTypeId"/>
<field-to-request field-name="DONE_PAGE"/>
<field-to-request field-name="preContactMechTypeId"/>
<field-to-request field-name="contactMechPurposeTypeId"/>
@@ -56,9 +56,9 @@
<result-to-request result-name="paymentMethodId"
request-name="paymentMethodId"/>
</call-service>
<if-compare map-name="parameters" field-name="contactMechId"
operator="equals" value="_NEW_">
- <string-to-field string="address" field-name="_response_code_"/>
- <string-to-field string="POSTAL_ADDRESS"
field-name="preContactMechTypeId"/>
- <string-to-field string="BILLING_LOCATION"
field-name="contactMechPurposeTypeId"/>
+ <set value="address" field="_response_code_"/>
+ <set value="POSTAL_ADDRESS" field="preContactMechTypeId"/>
+ <set value="BILLING_LOCATION" field="contactMechPurposeTypeId"/>
<field-to-request field-name="DONE_PAGE"/>
<field-to-request field-name="preContactMechTypeId"/>
<field-to-request field-name="contactMechPurposeTypeId"/>
Modified:
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxRateServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxRateServices.xml?view=diff&rev=466405&r1=466404&r2=466405
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxRateServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxRateServices.xml
Sat Oct 21 07:34:11 2006
@@ -26,10 +26,10 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<if-empty field-name="fromDate" map-name="newEntity">
<now-timestamp-to-env env-name="fromDate"/>
- <env-to-field env-name="fromDate" map-name="newEntity"
field-name="fromDate"/>
+ <set from-field="fromDate" field="newEntity.fromDate"/>
</if-empty>
<if-empty field-name="taxCategory" map-name="newEntity">
- <string-to-field string="_NA_" map-name="newEntity"
field-name="taxCategory"/>
+ <set value="_NA_" field="newEntity.taxCategory"/>
</if-empty>
<create-value value-name="newEntity"/>
