You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/31 18:47:40 UTC
svn commit: r730433 [1/3] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/scr...
Author: jleroux
Date: Wed Dec 31 09:47:37 2008
New Revision: 730433
URL: http://svn.apache.org/viewvc?rev=730433&view=rev
Log:
Fix issues with now-timestamp-to-env and sequence-id-to-env : their factories names where missing in org.ofbiz.minilang.method.MethodOperation$Factory file
also
<sequenced-id-to-env(.*)env-name => <sequenced-id$1field
<now-timestamp-to-env(.*)env-name => <now-timestamp$1field
both on *SimpleMethods*.xml, *events*.xml, *formula*.xml, *services*.xml, *tests*.xml (previously I only used *events*.xml, *services*.xml, but I guess it's not a big deal for now)
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.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/party/script/org/ofbiz/party/content/PartyContentServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
ofbiz/trunk/framework/minilang/src/META-INF/services/org.ofbiz.minilang.method.MethodOperation$Factory
ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Wed Dec 31 09:47:37 2008
@@ -105,7 +105,7 @@
<simple-method method-name="updateFXConversion" short-description="Update Foreign Exchange conversion rate">
<!-- set the FX rate changes as of now -->
<if-empty field="parameters.asOfTimestamp">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<else>
<set from-field="parameters.asOfTimestamp" field="nowTimestamp"/>
</else>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml Wed Dec 31 09:47:37 2008
@@ -32,12 +32,12 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- create a non existing ID -->
- <sequenced-id-to-env sequence-name="Agreement" env-name="agreementId"/>
+ <sequenced-id sequence-name="Agreement" field="agreementId"/>
<set from-field="agreementId" field="newEntity.agreementId"/>
<field-to-result field="agreementId" result-name="agreementId"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
@@ -59,7 +59,7 @@
<simple-method method-name="cancelAgreement" short-description="Cancel an existing Agreement">
<entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
<check-errors/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="agreement.thruDate"/>
<store-value value-field="agreement"/>
<check-errors/>
@@ -157,7 +157,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- create a non existing ID -->
- <sequenced-id-to-env sequence-name="AgreementTerm" env-name="agreementTermId"/>
+ <sequenced-id sequence-name="AgreementTerm" field="agreementTermId"/>
<set from-field="parameters.agreementId" field="newEntity.agreementId"/>
<set from-field="parameters.agreementItemSeqId" field="newEntity.agreementItemSeqId"/>
<set from-field="agreementTermId" field="newEntity.agreementTermId"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml Wed Dec 31 09:47:37 2008
@@ -23,7 +23,7 @@
<simple-method method-name="createCostComponentCalc" short-description="Create a CostComponentCalc entry">
<make-value entity-name="CostComponentCalc" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="CostComponentCalc" env-name="costComponentCalcId"/>
+ <sequenced-id sequence-name="CostComponentCalc" field="costComponentCalcId"/>
<set from-field="costComponentCalcId" field="newEntity.costComponentCalcId"/>
<field-to-result field="costComponentCalcId" result-name="costComponentCalcId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -43,7 +43,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="newEntity.fromDate"/>
+ <now-timestamp field="newEntity.fromDate"/>
</if-empty>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml Wed Dec 31 09:47:37 2008
@@ -26,7 +26,7 @@
<!-- NOTE: this is not yet complete -->
<!-- NOTE: this will behave differently depending on how the FinAccount is used, see comments on different GlAccounts for trans entries below -->
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/>
<set field="finAccountId" from-field="finAccountTrans.finAccountId"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Wed Dec 31 09:47:37 2008
@@ -40,7 +40,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.finAccountId">
- <sequenced-id-to-env sequence-name="FinAccount" env-name="finAccountId"/>
+ <sequenced-id sequence-name="FinAccount" field="finAccountId"/>
<to-string field-name="finAccountId"/>
<set from-field="finAccountId" field="newEntity.finAccountId"/>
</if-empty>
@@ -138,7 +138,7 @@
</simple-method>
<simple-method method-name="createFinAccountStatus" short-description="Create FinAccountStatus">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<!-- find the most recent status record and set the statusEndDate -->
<entity-and entity-name="FinAccountStatus" list="oldFinAccountStatusList">
@@ -164,9 +164,9 @@
<make-value value-field="newEntity" entity-name="FinAccountTrans"/>
<set-nonpk-fields value-field="newEntity" map="parameters"/>
- <sequenced-id-to-env sequence-name="FinAccountTrans" env-name="newEntity.finAccountTransId"/>
+ <sequenced-id sequence-name="FinAccountTrans" field="newEntity.finAccountTransId"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<if-empty field="newEntity.transactionDate">
<set from-field="nowTimestamp" field="newEntity.transactionDate"/>
</if-empty>
@@ -196,7 +196,7 @@
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="newEntity.fromDate"/>
+ <now-timestamp field="newEntity.fromDate"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -218,9 +218,9 @@
<make-value value-field="newEntity" entity-name="FinAccountAuth"/>
<set-nonpk-fields value-field="newEntity" map="parameters"/>
- <sequenced-id-to-env sequence-name="FinAccountAuth" env-name="newEntity.finAccountAuthId"/>
+ <sequenced-id sequence-name="FinAccountAuth" field="newEntity.finAccountAuthId"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<if-empty field="newEntity.authorizationDate">
<set from-field="nowTimestamp" field="newEntity.authorizationDate"/>
</if-empty>
@@ -243,7 +243,7 @@
<simple-method method-name="expireFinAccountAuth" short-description="Expire a Financial Account Authorization">
<entity-one entity-name="FinAccountAuth" value-field="finAccountAuth"/>
<if-empty field="parameters.expireDateTime">
- <now-timestamp-to-env env-name="finAccountAuth.thruDate"/>
+ <now-timestamp field="finAccountAuth.thruDate"/>
<else>
<set from-field="parameters.expireDatetime" field="finAccountAuth.thruDate"/>
</else>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Wed Dec 31 09:47:37 2008
@@ -33,7 +33,7 @@
<!-- create a non existing ID if not supplied -->
<if-empty field="parameters.fixedAssetId">
- <sequenced-id-to-env sequence-name="FixedAsset" env-name="newEntity.fixedAssetId"/>
+ <sequenced-id sequence-name="FixedAsset" field="newEntity.fixedAssetId"/>
<else>
<!-- check the Duplicate ID> -->
<entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
@@ -69,7 +69,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="newEntity.fromDate"/>
+ <now-timestamp field="newEntity.fromDate"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -142,7 +142,7 @@
<!-- cancel an existing Agreement -->
<simple-method method-name="cancelFixedAssetStdCost" short-description="Cancel an existing FixedAssetStdCost">
<entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
- <now-timestamp-to-env env-name="fixedAssetStdCost.thruDate"/>
+ <now-timestamp field="fixedAssetStdCost.thruDate"/>
<store-value value-field="fixedAssetStdCost"/>
</simple-method>
@@ -169,7 +169,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="newEntity.fromDate"/>
+ <now-timestamp field="newEntity.fromDate"/>
</if-empty>
<create-value value-field="newEntity"/>
</simple-method>
@@ -208,7 +208,7 @@
<if-not-empty field="maintTemplateWorkEffortId">
<set field="duplicateTemplateWorkEffortMap.oldWorkEffortId" from-field="maintTemplateWorkEffortId"/>
- <sequenced-id-to-env sequence-name="WorkEffort" env-name="duplicateTemplateWorkEffortMap.workEffortId"/>
+ <sequenced-id sequence-name="WorkEffort" field="duplicateTemplateWorkEffortMap.workEffortId"/>
<set field="duplicateTemplateWorkEffortMap.duplicateWorkEffortAssocs" value="Y"/>
<set field="duplicateTemplateWorkEffortMap.duplicateWorkEffortNotes" value="Y"/>
<set field="duplicateTemplateWorkEffortMap.duplicateWorkEffortContents" value="Y"/>
@@ -276,7 +276,7 @@
</and>
</condition>
<then>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="updateWorkEffortCtx.workEffortId" from-field="workEffortId"/>
<set field="updateWorkEffortCtx.currentStatusId" value="CAL_ACCEPTED"/>
<call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/>
@@ -380,7 +380,7 @@
</iterate>
</simple-method>
<simple-method method-name="createMaintsFromTimeInterval" short-description="Create Fixed Asset Maintenances From A Product Maint Time Interval">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<entity-condition list="fixedAssets" entity-name="FixedAsset">
<condition-list combine="and">
<condition-expr field-name="instanceOfProductId" operator="not-equals" from-field="null"/>
@@ -521,7 +521,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -694,7 +694,7 @@
</if-empty>
<!-- Get running year -->
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<to-string field="nowTimestamp"/>
<call-object-method method-name="substring" obj-field="nowTimestamp" ret-field="currentYear">
<field field="startIndex" type="int"/>
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=730433&r1=730432&r2=730433&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 Wed Dec 31 09:47:37 2008
@@ -55,7 +55,7 @@
<log level="info" message="In createInvoice sequence enum INVSQ_RESTARTYR"/>
<!-- this is sequential sequencing, we can't skip a number; except that it is restarted each fiscal year -->
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<if-empty field="partyAcctgPreference.lastInvoiceRestartDate">
<!-- if no lastInvoiceRestartDate then it's easy, just start now with 1 -->
<calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
@@ -103,7 +103,7 @@
<!-- default to the default sequencing: INVSQ_STANDARD -->
<set from-field="parameters.invoiceId" field="invoiceIdTemp"/>
<if-empty field="invoiceIdTemp">
- <sequenced-id-to-env sequence-name="Invoice" env-name="invoiceIdTemp"/>
+ <sequenced-id sequence-name="Invoice" field="invoiceIdTemp"/>
<else>
<!-- check the provided ID -->
<check-id field-name="invoiceIdTemp"/>
@@ -120,7 +120,7 @@
<simple-method method-name="createInvoice" short-description="Create a new Invoice">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<make-value value-field="newEntity" entity-name="Invoice"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -169,7 +169,7 @@
<result-to-field result-name="invoiceItems" field="invoiceItems"/>
</call-service>
<set field="invoice.invoiceId" from-field="parameters.invoiceId"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="invoice.invoiceDate" from-field="nowTimestamp"/>
<set field="invoice.statusId" value="INVOICE_IN_PROCESS"/>
<if-not-empty field="parameters.invoiceTypeId">
@@ -229,7 +229,7 @@
<if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals">
<set from-field="parameters.invoiceId" field="inputMap.invoiceId"/>
<set from-field="parameters.statusId" field="inputMap.statusId"/>
- <now-timestamp-to-env env-name="inputMap.statusDate"/>
+ <now-timestamp field="inputMap.statusDate"/>
<call-service service-name="setInvoiceStatus" in-map-name="inputMap"/>
</if-compare-field>
</if-not-empty>
@@ -371,7 +371,7 @@
<if-compare field="invoice.statusId" operator="equals" value="INVOICE_PAID">
<set field="invoiceStatusMap.invoiceId" value="${paymentApplication.invoiceId}" />
<set field="invoiceStatusMap.statusId" value="INVOICE_READY"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="invoiceStatusMap.statusDate" from-field="nowTimestamp" />
<call-service service-name="setInvoiceStatus" in-map-name="invoiceStatusMap" />
</if-compare>
@@ -423,7 +423,7 @@
<make-value value-field="newEntity" entity-name="InvoiceRole"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.datetimePerformed"><now-timestamp-to-env env-name="newEntity.datetimePerformed"/></if-empty>
+ <if-empty field="newEntity.datetimePerformed"><now-timestamp field="newEntity.datetimePerformed"/></if-empty>
<create-value value-field="newEntity"/>
</simple-method>
@@ -456,7 +456,7 @@
<!-- if it's OK to mark invoice paid, use parameter for paidDate -->
<if-empty field="parameters.paidDate">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="invoice.paidDate"/>
<else>
<set from-field="parameters.paidDate" field="invoice.paidDate"/>
@@ -478,7 +478,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.statusDate">
- <now-timestamp-to-env env-name="newEntity.statusDate"/>
+ <now-timestamp field="newEntity.statusDate"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -506,7 +506,7 @@
<make-value value-field="newEntity" entity-name="InvoiceTerm"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="InvoiceTerm" env-name="newEntity.invoiceTermId"/>
+ <sequenced-id sequence-name="InvoiceTerm" field="newEntity.invoiceTermId"/>
<field-to-result field="newEntity.invoiceTermId" result-name="invoiceTermId"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Wed Dec 31 09:47:37 2008
@@ -27,7 +27,7 @@
<set field="newEntity.isPosted" value="N"/>
<!-- AcctgTrans uses a sequenced id, so get the next one now and set it... -->
- <sequenced-id-to-env sequence-name="AcctgTrans" env-name="newEntity.acctgTransId"/>
+ <sequenced-id sequence-name="AcctgTrans" field="newEntity.acctgTransId"/>
<field-to-result field="newEntity.acctgTransId" result-name="acctgTransId"/>
<set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
@@ -431,7 +431,7 @@
<!-- for AcctgTrans: set isPosted to Y, postedDate to now -->
<set from-field="acctgTrans.acctgTransId" field="updateAcctgTransParams.acctgTransId"/>
- <now-timestamp-to-env env-name="updateAcctgTransParams.postedDate"/>
+ <now-timestamp field="updateAcctgTransParams.postedDate"/>
<set value="Y" field="updateAcctgTransParams.isPosted"/>
<call-service service-name="updateAcctgTrans" in-map-name="updateAcctgTransParams" include-user-login="true"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml Wed Dec 31 09:47:37 2008
@@ -24,13 +24,13 @@
<make-value value-field="newEntity" entity-name="BillingAccount"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="BillingAccount" env-name="billingAccountId"/>
+ <sequenced-id sequence-name="BillingAccount" field="billingAccountId"/>
<to-string field-name="billingAccountId"/>
<set from-field="billingAccountId" field="newEntity.billingAccountId"/>
<field-to-result field="billingAccountId" result-name="billingAccountId"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
@@ -48,7 +48,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.fromDate"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -70,7 +70,7 @@
<make-value value-field="newEntity" entity-name="BillingAccountTerm"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="BillingAccountTerm" env-name="billingAccountTermId"/>
+ <sequenced-id sequence-name="BillingAccountTerm" field="billingAccountTermId"/>
<to-string field-name="billingAccountTermId"/>
<set from-field="billingAccountTermId" field="newEntity.billingAccountTermId"/>
<field-to-result field="billingAccountTermId" result-name="billingAccountTermId"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Wed Dec 31 09:47:37 2008
@@ -37,7 +37,7 @@
<make-value entity-name="Payment" value-field="payment"/>
<if-empty field="parameters.paymentId">
- <sequenced-id-to-env sequence-name="Payment" env-name="payment.paymentId"/>
+ <sequenced-id sequence-name="Payment" field="payment.paymentId"/>
<else>
<set field="payment.paymentId" from-field="parameters.paymentId"/>
</else>
@@ -59,7 +59,7 @@
<set-nonpk-fields map="parameters" value-field="payment"/>
<if-empty field="payment.effectiveDate">
- <now-timestamp-to-env env-name="payment.effectiveDate"/>
+ <now-timestamp field="payment.effectiveDate"/>
</if-empty>
<create-value value-field="payment"/>
</simple-method>
@@ -104,7 +104,7 @@
<set field="payment.statusId" from-field="statusIdSave"/> <!-- do not allow status change here -->
<if-empty field="payment.effectiveDate">
- <now-timestamp-to-env env-name="payment.effectiveDate"/>
+ <now-timestamp field="payment.effectiveDate"/>
</if-empty>
<if-not-empty field="payment.paymentMethodId">
<entity-one entity-name="PaymentMethod" value-field="paymentMethod">
@@ -158,7 +158,7 @@
</if-not-empty>
</if-not-empty>
- <sequenced-id-to-env sequence-name="PaymentApplication" env-name="paymentAppl.paymentApplicationId"/>
+ <sequenced-id sequence-name="PaymentApplication" field="paymentAppl.paymentApplicationId"/>
<field-to-result field="paymentAppl.paymentApplicationId" result-name="paymentApplicationId"/>
<create-value value-field="paymentAppl"/>
@@ -350,7 +350,7 @@
</simple-method>
<simple-method method-name="getInvoicePaymentInfoListByDueDateOffset" short-description="Select a list with information on payment due dates and amounts for invoices.">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="asOfDate">
<field field="nowTimestamp" type="Timestamp"/>
<field field="parameters.daysOffset" type="Long"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Wed Dec 31 09:47:37 2008
@@ -65,7 +65,7 @@
<make-value entity-name="RateAmount" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <now-timestamp-to-env env-name="newEntity.fromDate"/>
+ <now-timestamp field="newEntity.fromDate"/>
<clear-field field="newEntity.thruDate"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -95,7 +95,7 @@
<entity-one entity-name="RateAmount" value-field="rateAmount"/>
<if-not-empty field="rateAmount">
- <now-timestamp-to-env env-name="rateAmount.thruDate"/>
+ <now-timestamp field="rateAmount.thruDate"/>
<store-value value-field="rateAmount"/>
<else>
<add-error><fail-message message="could not find record to be deleted"/></add-error>
@@ -303,13 +303,13 @@
</entity-and>
<if-not-empty field="partyRates">
<first-from-list entry="partyRate" list="partyRates"/>
- <now-timestamp-to-env env-name="partyRate.thruDate"/>
+ <now-timestamp field="partyRate.thruDate"/>
<store-value value-field="partyRate"/>
</if-not-empty>
<make-value value-field="newEntity" entity-name="PartyRate"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<call-simple-method method-name="checkOtherDefaultRate"/>
<create-value value-field="newEntity"/>
@@ -342,7 +342,7 @@
<check-errors/>
<entity-one entity-name="PartyRate" value-field="lookedUpValue"/>
- <now-timestamp-to-env env-name="lookedUpValue.thruDate"/>
+ <now-timestamp field="lookedUpValue.thruDate"/>
<store-value value-field="lookedUpValue"/>
<set-service-fields service-name="deleteRateAmount" map="parameters" to-map="delRateAmount"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Wed Dec 31 09:47:37 2008
@@ -58,7 +58,7 @@
<make-value entity-name="TaxAuthorityAssoc" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -157,7 +157,7 @@
<check-errors/>
<make-value entity-name="TaxAuthorityRateProduct" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="TaxAuthorityRateProduct" env-name="newEntity.taxAuthorityRateSeqId"/>
+ <sequenced-id sequence-name="TaxAuthorityRateProduct" field="newEntity.taxAuthorityRateSeqId"/>
<field-to-result field="newEntity.taxAuthorityRateSeqId" result-name="taxAuthorityRateSeqId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -194,7 +194,7 @@
<make-value entity-name="PartyTaxAuthInfo" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
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=730433&r1=730432&r2=730433&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 Wed Dec 31 09:47:37 2008
@@ -49,7 +49,7 @@
<make-value entity-name="Content" value-field="rootInstanceContent"/>
<if-empty field="parameters.rootInstanceContentId">
- <sequenced-id-to-env sequence-name="Content" env-name="rootInstanceContent.contentId"/>
+ <sequenced-id sequence-name="Content" field="rootInstanceContent.contentId"/>
<log level="info" message="genCompDocInstance 2> rootInstanceContent: ${rootInstanceContent}"/>
<else>
<!-- check to see if it already exists, error if so -->
@@ -68,7 +68,7 @@
<!-- populate fields -->
<set from-field="parameters.contentName" field="rootInstanceContent.contentName" default-value="${rootTemplateContent.contentName}"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set from-field="parameters.instanceOfContentId" field="rootInstanceContent.instanceOfContentId"/>
<set from-field="nowTimestamp" field="rootInstanceContent.createdDate"/>
<set from-field="nowTimestamp" field="rootInstanceContent.lastModifiedDate"/>
@@ -124,7 +124,7 @@
<iterate list="contentAssocList" entry="templateContentAssoc">
<clone-value value-name="templateContent" new-value-name="instanceContent"/>
- <sequenced-id-to-env sequence-name="Content" env-name="instanceContent.contentId"/>
+ <sequenced-id sequence-name="Content" field="instanceContent.contentId"/>
<set value="TEMPLATE" field="instanceContent.contentTypeId"/>
<create-value value-field="instanceContent"/>
@@ -494,7 +494,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.contentApprovalId">
- <sequenced-id-to-env sequence-name="ContentApproval" env-name="newEntity.contentApprovalId"/>
+ <sequenced-id sequence-name="ContentApproval" field="newEntity.contentApprovalId"/>
</if-empty>
<create-value value-field="newEntity"/>
<check-errors/>
@@ -597,7 +597,7 @@
<set from-field="parameters.contentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
<set from-field="parameters.contentId" field="contentApproval.contentId"/>
- <sequenced-id-to-env sequence-name="ContentApproval" env-name="contentApproval.contentApprovalId"/>
+ <sequenced-id sequence-name="ContentApproval" field="contentApproval.contentApprovalId"/>
<clear-field field="contentApproval.approvalStatusId"/>
<log level="info" message="contentApproval 2b: ${contentApproval}"/>
<create-value value-field="contentApproval"/>
@@ -611,7 +611,7 @@
<set from-field="parameters.contentRevisionSeqId" field="thisContentRevisionSeqId"/>
<log level="info" message="cloneContentApprovals(0)- thisContentRevisionSeqId : ${thisContentRevisionSeqId}"/>
<log level="info" message="cloneContentApprovals(0b)- parameters : ${parameters} "/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<!-- get previous list of ContentApproval -->
<entity-condition entity-name="MaxContentApprovalView" list="maxContentApprovalList">
<condition-list combine="and">
@@ -651,7 +651,7 @@
<set from-field="thisContentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
<set from-field="thisContentId" field="contentApproval.contentId"/>
- <sequenced-id-to-env sequence-name="ContentApproval" env-name="contentApproval.contentApprovalId"/>
+ <sequenced-id sequence-name="ContentApproval" field="contentApproval.contentApprovalId"/>
<set value="CNTAP_READY" field="contentApproval.approvalStatusId"/>
<set from-field="nowTimestamp" field="contentApproval.approvalDate"/>
<log level="info" message="contentApproval 2b: ${contentApproval}"/>
@@ -673,7 +673,7 @@
<clone-value value-name="existingContentApproval" new-value-name="contentApproval"/>
<set from-field="thisContentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
- <sequenced-id-to-env sequence-name="ContentApproval" env-name="contentApproval.contentApprovalId"/>
+ <sequenced-id sequence-name="ContentApproval" field="contentApproval.contentApprovalId"/>
<set from-field="nowTimestamp" field="contentApproval.approvalDate"/>
<if-compare field="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE">
<if>
@@ -753,7 +753,7 @@
<set from-field="thisContentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
<set field="contentApproval.contentId" from-field="thisContentId"/>
- <sequenced-id-to-env sequence-name="ContentApproval" env-name="contentApproval.contentApprovalId"/>
+ <sequenced-id sequence-name="ContentApproval" field="contentApproval.contentApprovalId"/>
<set field="contentApproval.approvalStatusId" value="CNTAP_READY"/>
<log level="info" message="contentApproval 2b: ${contentApproval}"/>
<create-value value-field="contentApproval"/>
@@ -776,7 +776,7 @@
<return/>
</if-compare>
<if-not-empty field="contentApproval.roleTypeId">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<entity-condition entity-name="ContentRole" list="contentRoleList">
<condition-list combine="and">
<condition-expr field-name="contentId" from-field="contentId" operator="equals"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Wed Dec 31 09:47:37 2008
@@ -25,7 +25,7 @@
<set-nonpk-fields map="parameters" value-field="currentContent"/>
<if-empty field="currentContent.contentId">
<make-next-seq-id seq-field-name="contentId" value-field="currentContent"/>
- <sequenced-id-to-env env-name="id" sequence-name="Content"/>
+ <sequenced-id field="id" sequence-name="Content"/>
<set field="currentContent.contentId" from-field="id"/>
</if-empty>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Wed Dec 31 09:47:37 2008
@@ -28,7 +28,7 @@
<set-pk-fields value-field="content" map="parameters"/>
<if-empty field="content.contentId">
- <sequenced-id-to-env sequence-name="Content" env-name="contentId"/>
+ <sequenced-id sequence-name="Content" field="contentId"/>
<set field="content.contentId" from-field="contentId"/>
</if-empty>
@@ -42,7 +42,7 @@
<set field="content.statusId" from-field="statusItem.statusId"/>
</if-empty>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
<set field="content.createdByUserLogin" from-field="userLogin.userLoginId"/>
<set field="content.lastModifiedDate" from-field="nowTimestamp"/>
@@ -56,7 +56,7 @@
<entity-one entity-name="Content" value-field="content" auto-field-map="true"/>
<set-nonpk-fields value-field="content" map="parameters"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
<set field="content.lastModifiedDate" from-field="nowTimestamp"/>
@@ -78,7 +78,7 @@
<set-pk-fields value-field="assoc" map="parameters"/>
<set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" />
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<if-empty field="assoc.fromDate">
<set field="assoc.fromDate" from-field="nowTimestamp"/>
</if-empty>
@@ -97,7 +97,7 @@
<entity-one entity-name="ContentAssoc" value-field="assoc" auto-field-map="true"/>
<set-nonpk-fields value-field="assoc" map="parameters"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
<set field="content.lastModifiedDate" from-field="nowTimestamp"/>
@@ -209,11 +209,11 @@
<set from-field="parameters.contentAssocTypeId" field="newContentAssoc.contentAssocTypeId"/>
<set from-field="newUserLogin.userLoginId" field="newContentAssoc.createdByUserLogin"/>
<set from-field="newUserLogin.userLoginId" field="newContentAssoc.lastModifiedByUserLogin"/>
- <now-timestamp-to-env env-name="newContentAssoc.createdDate"/>
- <now-timestamp-to-env env-name="newContentAssoc.lastModifiedDate"/>
+ <now-timestamp field="newContentAssoc.createdDate"/>
+ <now-timestamp field="newContentAssoc.lastModifiedDate"/>
<if-empty field="parameters.fromDate">
- <now-timestamp-to-env env-name="parameters.fromDate"/>
+ <now-timestamp field="parameters.fromDate"/>
<to-string map-name="parameters" field-name="fromDate" />
</if-empty>
<set from-field="parameters.fromDate" field="newContentAssoc.fromDate"/>
@@ -249,7 +249,7 @@
<!-- Methods for ContentRole -->
<simple-method method-name="createContentRole" short-description="Create Content Role">
<if-empty field="parameters.fromDate">
- <now-timestamp-to-env env-name="parameters.fromDate"/>
+ <now-timestamp field="parameters.fromDate"/>
</if-empty>
<make-value value-field="partyRolePK" entity-name="PartyRole"/>
<set-pk-fields value-field="partyRolePK" map="parameters"/>
@@ -284,7 +284,7 @@
<find-by-and entity-name="ContentRole" map="lookupKeyValue" list="roleList"/>
<iterate entry="contentRoleMap" list="roleList">
<make-value entity-name="ContentRole" value-field="role" map-name="contentRoleMap"/>
- <now-timestamp-to-env env-name="role.thruDate"/>
+ <now-timestamp field="role.thruDate"/>
<store-value value-field="role"/>
</iterate>
</simple-method>
@@ -721,8 +721,8 @@
<set from-field="parameters.newTopicDescription" field="content.description" />
<set value="TOPIC" field="content.contentTypeId" />
- <now-timestamp-to-env env-name="content.lastModifiedDate"/>
- <now-timestamp-to-env env-name="content.createdDate"/>
+ <now-timestamp field="content.lastModifiedDate"/>
+ <now-timestamp field="content.createdDate"/>
<set from-field="parameters.userLogin.userLoginId" field="content.lastModifiedByUserLogin"/>
<set from-field="parameters.userLogin.userLoginId" field="content.createdByUserLogin"/>
@@ -777,7 +777,7 @@
<check-errors/>
-->
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/>
<!-- let's take a guess at what the dataResourceTypeId should be if it is empty -->
<if-empty field="persistIn.dataResourceTypeId">
@@ -844,7 +844,7 @@
<set-pk-fields value-field="commEventContentAssoc" map="parameters"/>
<set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/>
<if-empty field="commEventContentAssoc.fromDate">
- <now-timestamp-to-env env-name="commEventContentAssoc.fromDate"/>
+ <now-timestamp field="commEventContentAssoc.fromDate"/>
</if-empty>
<create-value value-field="commEventContentAssoc" />
<field-to-result field="commEventContentAssoc.fromDate" result-name="fromDate"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Wed Dec 31 09:47:37 2008
@@ -27,11 +27,11 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.dataResourceId">
- <sequenced-id-to-env sequence-name="DataResource" env-name="dataResourceId"/>
+ <sequenced-id sequence-name="DataResource" field="dataResourceId"/>
<set field="newEntity.dataResourceId" from-field="dataResourceId"/>
</if-empty>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
<set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId"/>
<set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/>
@@ -63,7 +63,7 @@
<to-string map-name="parameters" field-name="locale" />
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
<set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/>
@@ -168,7 +168,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Wed Dec 31 09:47:37 2008
@@ -73,7 +73,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<if-empty field="newEntity.webSiteContentTypeId">
- <sequenced-id-to-env sequence-name="WebSiteContentTypeId" env-name="webSiteContentTypeId"/>
+ <sequenced-id sequence-name="WebSiteContentTypeId" field="webSiteContentTypeId"/>
<set field="newEntity.webSiteContentTypeId" from-field="webSiteContentTypeId"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -126,7 +126,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
@@ -151,7 +151,7 @@
<entity-one entity-name="WebSite" value-field="webSite">
<field-map field-name="webSiteId" from-field="parameters.webSiteId"/>
</entity-one>
- <now-timestamp-to-env env-name="now"/>
+ <now-timestamp field="now"/>
<log level="always" message="Parameters: ${parameters}"/>
<if-instance-of field-name="parameters.webSiteContentTypeId" class="String">
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Wed Dec 31 09:47:37 2008
@@ -38,7 +38,7 @@
<property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
<property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
- <now-timestamp-to-env env-name="nowStamp"/>
+ <now-timestamp field="nowStamp"/>
<set value="CUSTOMER" field="parameters.roleTypeId"/>
<if-compare field="allowPassword" operator="not-equals" value="Y">
@@ -504,7 +504,7 @@
<simple-method method-name="validateCustomerInfo" short-description="validateCustomerInfo" login-required="false">
<!-- timestamp to be used -->
- <now-timestamp-to-env env-name="nowStamp"/>
+ <now-timestamp field="nowStamp"/>
<!-- setup the party/person -->
<if-not-empty field="parameters.birthDateYear">
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Wed Dec 31 09:47:37 2008
@@ -30,7 +30,7 @@
<property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/>
<property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/>
<set field="default_user_password" value="ungssblepsswd" />
- <now-timestamp-to-env env-name="nowStamp"/>
+ <now-timestamp field="nowStamp"/>
<if-compare field="create_allow_password" operator="not-equals" value="true">
<set field="parameters.password" from-field="default_user_password" />
Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Wed Dec 31 09:47:37 2008
@@ -26,7 +26,7 @@
<make-value entity-name="PartyQual" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -51,7 +51,7 @@
<simple-method method-name="createPartyResume" short-description="Create Resume for Party">
<make-value entity-name="PartyResume" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="PartyResume" env-name="newEntity.resumeId"/>
+ <sequenced-id sequence-name="PartyResume" field="newEntity.resumeId"/>
<field-to-result field="resumeId" result-name="resumeId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -106,7 +106,7 @@
<make-value entity-name="PerfReview" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="PerfReview" env-name="newEntity.perfReviewId"/>
+ <sequenced-id sequence-name="PerfReview" field="newEntity.perfReviewId"/>
<field-to-result field="perfReviewId" result-name="perfReviewId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -126,7 +126,7 @@
<make-value entity-name="PerfReviewItem" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="PerfReviewItem" env-name="newEntity.perfReviewItemSeqId"/>
+ <sequenced-id sequence-name="PerfReviewItem" field="newEntity.perfReviewItemSeqId"/>
<field-to-result field="perfReviewItemSeqId" result-name="perfReviewItemSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -147,7 +147,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -169,7 +169,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -192,7 +192,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -215,7 +215,7 @@
<simple-method method-name="createEmploymentApp" short-description="Create an Employment Application">
<make-value entity-name="EmploymentApp" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="EmploymentApp" env-name="newEntity.applicationId"/>
+ <sequenced-id sequence-name="EmploymentApp" field="newEntity.applicationId"/>
<field-to-result field="newEntity.applicationId" result-name="applicationId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -236,7 +236,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -249,7 +249,7 @@
</simple-method>
<simple-method method-name="deletePartyBenefit" short-description="Delete Party Benefit">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<entity-one entity-name="PartyBenefit" value-field="lookedUpValue"/>
<set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
<store-value value-field="lookedUpValue"/>
@@ -262,7 +262,7 @@
<if-not-empty field="parameters.payGradeId">
<set field="newEntity.payGradeId" from-field="parameters.payGradeId"/>
<else>
- <sequenced-id-to-env sequence-name="PayGrade" env-name="newEntity.payGradeId"/>
+ <sequenced-id sequence-name="PayGrade" field="newEntity.payGradeId"/>
</else>
</if-not-empty>
<field-to-result field="newEntity.payGradeId" result-name="payGradeId"/>
@@ -285,7 +285,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -298,7 +298,7 @@
</simple-method>
<simple-method method-name="deletePayHistory" short-description="Delete Pay History">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<entity-one entity-name="PayHistory" value-field="lookedUpValue"/>
<set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
<store-value value-field="lookedUpValue"/>
@@ -309,7 +309,7 @@
<make-value entity-name="PayrollPreference" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="PayrollPreference" env-name="newEntity.payrollPreferenceSeqId"/>
+ <sequenced-id sequence-name="PayrollPreference" field="newEntity.payrollPreferenceSeqId"/>
<field-to-result field="payrollPreferenceSeqId" result-name="payrollPreferenceSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -329,7 +329,7 @@
<make-value entity-name="SalaryStep" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="SalaryStep" env-name="newEntity.salaryStepSeqId"/>
+ <sequenced-id sequence-name="SalaryStep" field="newEntity.salaryStepSeqId"/>
<field-to-result field="salaryStepSeqId" result-name="salaryStepSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -348,7 +348,7 @@
<simple-method method-name="createTerminationReason" short-description="Create a Termination Reason">
<make-value entity-name="TerminationReason" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="TerminationReason" env-name="newEntity.terminationReasonId"/>
+ <sequenced-id sequence-name="TerminationReason" field="newEntity.terminationReasonId"/>
<field-to-result field="newEntity.terminationReasonId" result-name="terminationReasonId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -367,7 +367,7 @@
<simple-method method-name="createUnemploymentClaim" short-description="Create a Unemployment Claim">
<make-value entity-name="UnemploymentClaim" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="UnemploymentClaim" env-name="newEntity.unemploymentClaimId"/>
+ <sequenced-id sequence-name="UnemploymentClaim" field="newEntity.unemploymentClaimId"/>
<field-to-result field="newEntity.unemploymentClaimId" result-name="unemploymentClaimId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -379,7 +379,7 @@
</simple-method>
<simple-method method-name="deleteUnemploymentClaim" short-description="Delete Unemployment Claim">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<entity-one entity-name="UnemploymentClaim" value-field="lookedUpValue"/>
<set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/>
<store-value value-field="lookedUpValue"/>
@@ -389,7 +389,7 @@
<simple-method method-name="createEmplPosition" short-description="Create a Employee Position">
<make-value entity-name="EmplPosition" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="EmplPosition" env-name="newEntity.emplPositionId"/>
+ <sequenced-id sequence-name="EmplPosition" field="newEntity.emplPositionId"/>
<field-to-result field="newEntity.emplPositionId" result-name="emplPositionId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -410,7 +410,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -432,7 +432,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<if>
@@ -467,7 +467,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -489,7 +489,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <now-timestamp field="nowTimeStamp"/>
<set field="newEntity.fromDate" from-field="nowTimeStamp"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -509,7 +509,7 @@
<simple-method method-name="createSkillType" short-description="Create a SkillType">
<make-value entity-name="SkillType" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="SkillType" env-name="newEntity.skillTypeId"/>
+ <sequenced-id sequence-name="SkillType" field="newEntity.skillTypeId"/>
<field-to-result field="newEntity.skillTypeId" result-name="skillTypeId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -536,7 +536,7 @@
<set field="partyRelationshipCtx.roleTypeIdTo" value="EMPLOYEE"/>
<set field="partyRelationshipCtx.relationshipName" value="EMPLOYMENT"/>
<set field="partyRelationshipCtx.fromDate" from-field="parameters.fromDate"/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<if-empty field="partyRelationshipCtx.fromDate">
<set field="partyRelationshipCtx.fromDate" from-field="nowTimestamp"/>
</if-empty>
@@ -551,7 +551,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.responsibilityTypeId">
- <sequenced-id-to-env sequence-name="ResponsibilityType" env-name="newEntity.responsibilityTypeId"/>
+ <sequenced-id sequence-name="ResponsibilityType" field="newEntity.responsibilityTypeId"/>
</if-empty>
<field-to-result field="newEntity.responsibilityTypeId" result-name="responsibilityTypeId"/>
<create-value value-field="newEntity"/>
@@ -572,7 +572,7 @@
<make-value entity-name="TerminationType" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.terminationTypeId">
- <sequenced-id-to-env sequence-name="TerminationType" env-name="newEntity.terminationTypeId"/>
+ <sequenced-id sequence-name="TerminationType" field="newEntity.terminationTypeId"/>
</if-empty>
<field-to-result field="newEntity.terminationTypeId" result-name="terminationTypeId"/>
<create-value value-field="newEntity"/>
@@ -593,7 +593,7 @@
<make-value entity-name="EmplPositionType" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.emplPositionTypeId">
- <sequenced-id-to-env sequence-name="EmplPositionType" env-name="newEntity.emplPositionTypeId"/>
+ <sequenced-id sequence-name="EmplPositionType" field="newEntity.emplPositionTypeId"/>
</if-empty>
<field-to-result field="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/>
<create-value value-field="newEntity"/>
@@ -614,13 +614,13 @@
</entity-and>
<if-not-empty field="emplPositionTypeRates">
<first-from-list entry="emplPositionTypeRate" list="emplPositionTypeRates"/>
- <now-timestamp-to-env env-name="emplPositionTypeRate.thruDate"/>
+ <now-timestamp field="emplPositionTypeRate.thruDate"/>
<store-value value-field="emplPositionTypeRate"/>
</if-not-empty>
<make-value value-field="newEntity" entity-name="EmplPositionTypeRate"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -632,7 +632,7 @@
<simple-method method-name="deleteEmplPositionTypeRate" short-description="Delete EmplPositionTypeRate">
<entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>
- <now-timestamp-to-env env-name="lookedUpValue.thruDate"/>
+ <now-timestamp field="lookedUpValue.thruDate"/>
<store-value value-field="lookedUpValue"/>
<set-service-fields service-name="deleteRateAmount" map="parameters" to-map="delRateAmount"/>
@@ -677,7 +677,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.leaveTypeId">
- <sequenced-id-to-env sequence-name="EmplLeaveType" env-name="newEntity.leaveTypeId"/>
+ <sequenced-id sequence-name="EmplLeaveType" field="newEntity.leaveTypeId"/>
</if-empty>
<field-to-result field="newEntity.leaveTypeId" result-name="leaveTypeId"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml Wed Dec 31 09:47:37 2008
@@ -23,7 +23,7 @@
<!-- ProductAssoc -->
<simple-method method-name="createBOMAssoc" short-description="Create Product to Product Association">
<if-empty field="parameters.fromDate">
- <now-timestamp-to-env env-name="parameters.fromDate"/>
+ <now-timestamp field="parameters.fromDate"/>
</if-empty>
<set field="" from-field=""/>
@@ -129,7 +129,7 @@
<else>
<make-value value-name="newEntity" entity-name="ProductManufacturingRule"/>
<if-empty field="parameters.ruleId">
- <sequenced-id-to-env sequence-name="ProductManufacturingRule" env-name="parameters.ruleId"/>
+ <sequenced-id sequence-name="ProductManufacturingRule" field="parameters.ruleId"/>
</if-empty>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Wed Dec 31 09:47:37 2008
@@ -78,7 +78,7 @@
<!-- kind of like the inventory reservation routine, find InventoryItems to issue from, but instead of doing the reservation just create an issuance and an inventory item detail for the change -->
<if-not-empty field="productId">
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<!-- NOTE: the inventory will be issued from the WorkEffort.facilityId -->
<entity-one entity-name="WorkEffort" value-field="workEffort"/>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Wed Dec 31 09:47:37 2008
@@ -28,7 +28,7 @@
<if-not-empty field="parameters.applicableDate">
<set from-field="parameters.applicableDate" field="filterDate"/>
<else>
- <now-timestamp-to-env env-name="filterDate"/>
+ <now-timestamp field="filterDate"/>
</else>
</if-not-empty>
<!-- If a workEffortId has been passed, use it to look up the desired routing-->
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml Wed Dec 31 09:47:37 2008
@@ -34,7 +34,7 @@
</call-service>
</if-compare>
<if-empty field="parameters.fromDate">
- <now-timestamp-to-env env-name="parameters.fromDate"/>
+ <now-timestamp field="parameters.fromDate"/>
</if-empty>
<call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context1"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Wed Dec 31 09:47:37 2008
@@ -29,7 +29,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<!-- MarketingCampaign uses a sequenced id, so get the next one now and set it... -->
- <sequenced-id-to-env sequence-name="MarketingCampaign" env-name="newEntity.marketingCampaignId"/>
+ <sequenced-id sequence-name="MarketingCampaign" field="newEntity.marketingCampaignId"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Wed Dec 31 09:47:37 2008
@@ -27,7 +27,7 @@
<make-value entity-name="ContactList" value-field="newEntity"/>
<if-empty field="parameters.contactListId">
- <sequenced-id-to-env sequence-name="ContactList" env-name="newEntity.contactListId"/>
+ <sequenced-id sequence-name="ContactList" field="newEntity.contactListId"/>
<else>
<set field="newEntity.contactListId" from-field="parameters.contactListId"/>
</else>
@@ -107,7 +107,7 @@
<make-value entity-name="ContactListParty" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
<create-value value-field="newEntity"/>
@@ -176,7 +176,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <now-timestamp-to-env env-name="newEntity.statusDate"/>
+ <now-timestamp field="newEntity.statusDate"/>
<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 -->
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=730433&r1=730432&r2=730433&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Wed Dec 31 09:47:37 2008
@@ -29,7 +29,7 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="SegmentGroup"/>
- <sequenced-id-to-env sequence-name="SegmentGroup" env-name="newEntity.segmentGroupId"/>
+ <sequenced-id sequence-name="SegmentGroup" field="newEntity.segmentGroupId"/>
<field-to-result field="newEntity.segmentGroupId" result-name="segmentGroupId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -160,7 +160,7 @@
<check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission>
<check-errors/>
- <now-timestamp-to-env env-name="nowTimestamp"/>
+ <now-timestamp field="nowTimestamp"/>
<entity-condition entity-name="SegmentGroupViewRelatedParties" list="segmentGroupViewRelatedPartiesList">
<condition-list combine="and">
<condition-expr field-name="partyId" from-field="parameters.partyId"/>