You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 18:19:37 UTC
svn commit: r730189 [1/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/...
Author: jleroux
Date: Tue Dec 30 09:19:35 2008
New Revision: 730189
URL: http://svn.apache.org/viewvc?rev=730189&view=rev
Log:
<sequenced-id-to-env(.*)env-name => <sequenced-id$1field
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.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/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/humanres/script/org/ofbiz/humanres/HumanResServices.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/sfa/lead/LeadServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.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/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/contact/ContactMechServices.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/product/script/org/ofbiz/product/catalog/CatalogServices.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/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.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/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.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/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/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
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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"/>
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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>
@@ -126,7 +126,7 @@
<calculate field="lookedUpValue.replenishLevel" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}">
<calcop operator="get" field="lookedUpValue.replenishLevel"/>
</calculate>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
<field-to-result field="lookedUpValue.replenishPaymentId" result-name="replenishPaymentId"/>
<field-to-result field="lookedUpValue.replenishLevel" result-name="replenishLevel"/>
@@ -148,7 +148,7 @@
<first-from-list entry="oldFinAccountStatus" list="oldFinAccountStatusList"/>
<if-not-empty field="oldFinAccountStatus">
<set field="oldFinAccountStatus.statusEndDate" from-field="nowTimestamp"/>
- <store-value value-name="oldFinAccountStatus"/>
+ <store-value value-field="oldFinAccountStatus"/>
</if-not-empty>
<make-value entity-name="FinAccountStatus" value-field="newEntity"/>
@@ -164,7 +164,7 @@
<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"/>
<if-empty field="newEntity.transactionDate">
@@ -204,7 +204,7 @@
<simple-method method-name="updateFinAccountRole" short-description="Update a Financial Account Role">
<entity-one entity-name="FinAccountRole" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFinAccountRole" short-description="Delete a Financial Account Role">
<entity-one entity-name="FinAccountRole" value-field="lookedUpValue"/>
@@ -218,7 +218,7 @@
<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"/>
<if-empty field="newEntity.authorizationDate">
@@ -248,7 +248,7 @@
<set from-field="parameters.expireDatetime" field="finAccountAuth.thruDate"/>
</else>
</if-empty>
- <store-value value-name="finAccountAuth"/>
+ <store-value value-field="finAccountAuth"/>
</simple-method>
<!-- Some methods to maintain FinAccount.actualBalance and FinAccount.availableBalance -->
@@ -322,7 +322,7 @@
<log level="info" message="In updateFinAccountBalancesFromTrans/Auth updating FinAccount with ID [${finAccountId}] with actualBalance: ${finAccount.actualBalance} -> ${actualBalanceSum}, and availableBalance: ${finAccount.availableBalance} -> ${availableBalanceSum}"/>
<set field="finAccount.actualBalance" from-field="actualBalanceSum" type="Double"/>
<set field="finAccount.availableBalance" from-field="availableBalanceSum" type="Double"/>
- <store-value value-name="finAccount"/>
+ <store-value value-field="finAccount"/>
</simple-method>
<!-- FinAccountTypeGlAccount methods -->
@@ -336,7 +336,7 @@
<simple-method method-name="updateFinAccountTypeGlAccount" short-description="Update an FinAccountTypeGlAccount">
<entity-one entity-name="FinAccountTypeGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteFinAccountTypeGlAccount" short-description="Delete an FinAccountTypeGlAccount">
@@ -355,7 +355,7 @@
<simple-method method-name="updateVarianceReasonGlAccount" short-description="Update an Variance Reason Gl Account">
<entity-one entity-name="VarianceReasonGlAccount" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteVarianceReasonGlAccount" short-description="Delete an Variance Reason Gl Account">
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 2008
@@ -44,7 +44,7 @@
<calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate>
</else>
</if-not-empty>
- <store-value value-name="partyAcctgPreference"/>
+ <store-value value-field="partyAcctgPreference"/>
<set from-field="partyAcctgPreference.lastInvoiceNumber" field="invoiceIdTemp"/>
</then>
<else-if>
@@ -91,7 +91,7 @@
</if>
</else>
</if-empty>
- <store-value value-name="partyAcctgPreference"/>
+ <store-value value-field="partyAcctgPreference"/>
<!-- get the current year string for prefix, etc; simple 4 digit year date string (using system defaults) -->
<set field="curYearString" value="${str:toString(date:year(partyAcctgPreference.lastInvoiceRestartDate, util:defaultTimeZone(), util:defaultLocale()))}"/>
@@ -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"/>
@@ -215,7 +215,7 @@
<!-- only save if something has changed, do not update status here -->
<set from-field="savedValue.statusId" field="lookedUpValue.statusId"/> <!-- get old status back -->
<if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object">
- <store-value value-name="lookedUpValue"/> <!-- update all non status and key fields -->
+ <store-value value-field="lookedUpValue"/> <!-- update all non status and key fields -->
</if-compare-field>
<else>
<add-error><fail-message message="Can only update Invoice, when status is in-process...current status: ${lookedUpValue.statusId}"/></add-error>
@@ -309,7 +309,7 @@
</add-error>
</if-empty>
<if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object">
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</if-compare-field>
</simple-method>
<simple-method method-name="removeInvoiceItem" short-description="Remove an existing Invoice Item">
@@ -471,7 +471,7 @@
</if-not-empty>
<set from-field="parameters.statusId" field="invoice.statusId"/>
- <store-value value-name="invoice"/>
+ <store-value value-field="invoice"/>
<make-value value-field="newEntity" entity-name="InvoiceStatus"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -492,7 +492,7 @@
<iterate entry="entry" list="entries">
<clear-field field="entry.invoiceId"/>
<clear-field field="entry.invoiceItemSeqId"/>
- <store-value value-name="entry"/>
+ <store-value value-field="entry"/>
</iterate>
</if-compare>
</else>
@@ -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"/>
@@ -549,7 +549,7 @@
<simple-method method-name="updateInvoiceItemType" short-description="Updates a InvoiceItemType Record">
<entity-one entity-name="InvoiceItemType" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="autoGenerateInvoiceFromExistingInvoice" short-description="Scheduled service to generate Invoice from an existing Invoice">
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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"/>
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 2008
@@ -24,7 +24,7 @@
<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"/>
@@ -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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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>
@@ -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"/>
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 2008
@@ -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"/>
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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 -->
@@ -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"/>
@@ -276,7 +276,7 @@
<log level="info" message="persistCompDocContent(1).newDataResourceId : ${newDataResourceId}"/>
<set from-field="newDataResourceId" field="content.dataResourceId"/>
- <store-value value-name="content"/>
+ <store-value value-field="content"/>
<set from-field="parameters.rootContentId" field="revisionMap.contentId"/>
<set from-field="parameters.contentId" field="revisionMap.itemContentId"/>
<set from-field="parameters.userLogin" field="revisionMap.userLogin"/>
@@ -346,7 +346,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentRevision" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentRevision" short-description="Remove ContentRevision">
<check-permission action="_DELETE" permission="CONTENTMGR">
@@ -378,7 +378,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentRevisionItem" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentRevisionItem" short-description="Remove ContentRevisionItem">
<check-permission action="_DELETE" permission="CONTENTMGR">
@@ -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/>
@@ -510,7 +510,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentApproval" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentApproval" short-description="Remove ContentApproval">
<check-permission action="_DELETE" permission="CONTENTMGR">
@@ -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"/>
@@ -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"/>
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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-name="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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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>
@@ -60,7 +60,7 @@
<set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
<set field="content.lastModifiedDate" from-field="nowTimestamp"/>
- <store-value value-name="content"/>
+ <store-value value-field="content"/>
<field-to-result field="content.contentId" result-name="contentId"/>
</simple-method>
<simple-method method-name="removeContent" short-description="Remove a Content Record">
@@ -101,7 +101,7 @@
<set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
<set field="content.lastModifiedDate" from-field="nowTimestamp"/>
- <store-value value-name="assoc"/>
+ <store-value value-field="assoc"/>
</simple-method>
<simple-method method-name="removeContentAssoc" short-description="Remove a Content Assoc Record">
<make-value entity-name="ContentAssoc" value-field="lookupKeyValue"/>
@@ -129,7 +129,7 @@
<check-errors/>
<else>
<set from-field="parameters.statusId" field="content.statusId"/>
- <store-value value-name="content"/>
+ <store-value value-field="content"/>
</else>
</if-empty>
</if-compare-field>
@@ -237,7 +237,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentMetaData" short-description="Remove Content Meta Data">
<make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
@@ -274,7 +274,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentRole" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deactivateAllContentRoles" short-description="Update Content Role">
<make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
@@ -285,7 +285,7 @@
<iterate entry="contentRoleMap" list="roleList">
<make-value entity-name="ContentRole" value-field="role" map-name="contentRoleMap"/>
<now-timestamp-to-env env-name="role.thruDate"/>
- <store-value value-name="role"/>
+ <store-value value-field="role"/>
</iterate>
</simple-method>
<simple-method method-name="removeContentRole" short-description="Remove Content Role">
@@ -309,7 +309,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentType" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentType" short-description="Remove Content Type">
<make-value entity-name="ContentType" value-field="lookupKeyValue"/>
@@ -345,7 +345,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentAssocType" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentAssocType" short-description="Remove Content AssocType">
<make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/>
@@ -370,7 +370,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentPurposeType" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentPurposeType" short-description="Remove Content PurposeType">
<make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/>
@@ -392,7 +392,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentAssocPredicate" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentAssocPredicate" short-description="Remove Content AssocPredicate">
<make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/>
@@ -413,7 +413,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
<make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
@@ -434,7 +434,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentPurpose" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentPurpose" short-description="Remove Content Purpose">
<make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/>
@@ -460,7 +460,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentOperation" short-description="Remove Content Operation">
<make-value entity-name="ContentOperation" value-field="lookupKeyValue"/>
@@ -481,7 +481,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
<make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
@@ -502,7 +502,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentAttribute" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentAttribute" short-description="Remove Content Attribute">
<make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/>
@@ -523,7 +523,7 @@
<set-pk-fields map="parameters" value-field="lookupKeyValue"/>
<find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContentMetaData" short-description="Remove Content MetaData">
<check-errors/>
@@ -862,7 +862,7 @@
</add-error>
</if-empty>
<set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/>
- <store-value value-name="commEventContentAssoc" />
+ <store-value value-field="commEventContentAssoc" />
</simple-method>
<simple-method method-name="removeCommEventContentAssoc" short-description="Delete CommEventContentAssoc">
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 2008
@@ -27,7 +27,7 @@
<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>
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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"/>
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=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 09:19:35 2008
@@ -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>
@@ -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>
@@ -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"/>
@@ -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>
@@ -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>
@@ -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>
@@ -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"/>
@@ -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/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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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>
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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 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"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 09:19:35 2008
@@ -100,7 +100,7 @@
<log level="verbose" message=" ${partyGroupPartyId}"></log>
<if-not-empty field="parameters.leadSource">
<make-value entity-name="DataSource" value-field="dataSource"/>
- <sequenced-id-to-env sequence-name="DataSource" env-name="dataSourceId"/>
+ <sequenced-id sequence-name="DataSource" field="dataSourceId"/>
<set field="dataSource.dataSourceId" from-field="dataSourceId"/>
<set field="dataSource.dataSourceTypeId" value="LEAD_SOURCE"/>
<set field="dataSource.description" from-field="parameters.leadSource"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml Tue Dec 30 09:19:35 2008
@@ -24,7 +24,7 @@
<simple-method method-name="createOpportunity" short-description="Create Opportunity for SFA">
<make-value entity-name="SalesOpportunity" value-field="newEntity"/>
<if-empty field="parameters.salesOpportunityId">
- <sequenced-id-to-env sequence-name="SalesOpportunity" env-name="parameters.salesOpportunityId"/>
+ <sequenced-id sequence-name="SalesOpportunity" field="parameters.salesOpportunityId"/>
</if-empty>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Tue Dec 30 09:19:35 2008
@@ -29,7 +29,7 @@
<!-- make the value and set the fields from the parameters -->
<make-value value-field="salesForecast" entity-name="SalesForecast"/>
- <sequenced-id-to-env sequence-name="SalesForecast" env-name="salesForecastId"/>
+ <sequenced-id sequence-name="SalesForecast" field="salesForecastId"/>
<set field="salesForecast.salesForecastId" from-field="salesForecastId"/>
<set-nonpk-fields map="parameters" value-field="salesForecast"/>
@@ -66,7 +66,7 @@
<!-- make the value and set the fields from the salesForecast map -->
<make-value value-field="salesForecastHistory" entity-name="SalesForecastHistory"/>
- <sequenced-id-to-env sequence-name="SalesForecastHistory" env-name="salesForecastHistoryId"/>
+ <sequenced-id sequence-name="SalesForecastHistory" field="salesForecastHistoryId"/>
<set field="salesForecastHistory.salesForecastHistoryId" from-field="salesForecastHistoryId"/>
<set-nonpk-fields value-field="salesForecastHistory" map="salesForecast"/>
@@ -85,7 +85,7 @@
<!-- Sales Forecast Detail -->
<simple-method method-name="createSalesForecastDetail" short-description="Creates a sales forecast detail">
<make-value entity-name="SalesForecastDetail" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="SalesForecastDetail" env-name="newEntity.salesForecastDetailId"/>
+ <sequenced-id sequence-name="SalesForecastDetail" field="newEntity.salesForecastDetailId"/>
<field-to-result field="newEntity.salesForecastDetailId" result-name="salesForecastDetailId"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 09:19:35 2008
@@ -92,7 +92,7 @@
</call-service>
<else>
- <sequenced-id-to-env sequence-name="ReturnHeader" env-name="newEntity.returnId"/>
+ <sequenced-id sequence-name="ReturnHeader" field="newEntity.returnId"/>
</else>
</if-compare>
<field-to-result field="newEntity.returnId" result-name="returnId"/>
@@ -513,7 +513,7 @@
<make-value value-field="newEntity" entity-name="ReturnAdjustment"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="ReturnAdjustment" env-name="newEntity.returnAdjustmentId"/>
+ <sequenced-id sequence-name="ReturnAdjustment" field="newEntity.returnAdjustmentId"/>
<field-to-result field="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/>
<create-value value-field="newEntity"/>
<set field="responseMessage" value="Return Adjustment #${newEntity.returnAdjustmentId} was created successfully."/>
@@ -564,7 +564,7 @@
<!-- create status change history -->
<!-- TODO: this should be done with a createReturnStatus service call -->
<make-value entity-name="ReturnStatus" value-field="newReturnStatus"/>
- <sequenced-id-to-env sequence-name="ReturnStatus" env-name="newReturnStatus.returnStatusId"/>
+ <sequenced-id sequence-name="ReturnStatus" field="newReturnStatus.returnStatusId"/>
<set field="newReturnStatus.returnId" from-field="returnItem.returnItemSeqId"/>
<set field="newReturnStatus.returnId" from-field="returnItem.returnId"/>
@@ -614,7 +614,7 @@
<call-service service-name="updateReturnHeader" in-map-name="returnHeaderCtx"/>
<!-- create the status history -->
<make-value entity-name="ReturnStatus" value-field="newValue"/>
- <sequenced-id-to-env sequence-name="ReturnStatus" env-name="newValue.returnStatusId"/>
+ <sequenced-id sequence-name="ReturnStatus" field="newValue.returnStatusId"/>
<set field="newValue.returnId" from-field="returnHeader.returnId"/>
<set field="newValue.statusId" value="RETURN_RECEIVED"/>
@@ -629,7 +629,7 @@
</simple-method>
<simple-method method-name="createReturnItemResponse" short-description="Create a ReturnItemResponse">
<make-value value-field="newEntity" entity-name="ReturnItemResponse"/>
- <sequenced-id-to-env sequence-name="ReturnItemResponse" env-name="newEntity.returnItemResponseId"/>
+ <sequenced-id sequence-name="ReturnItemResponse" field="newEntity.returnItemResponseId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
<field-to-result field="newEntity.returnItemResponseId" result-name="returnItemResponseId"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 09:19:35 2008
@@ -498,7 +498,7 @@
<!-- default to the default sequencing: ODRSQ_STANDARD -->
<set from-field="parameters.orderId" field="orderIdTemp"/>
<if-empty field="orderIdTemp">
- <sequenced-id-to-env sequence-name="OrderHeader" env-name="orderIdTemp"/>
+ <sequenced-id sequence-name="OrderHeader" field="orderIdTemp"/>
<else>
<!-- check the provided ID -->
<check-id field-name="orderIdTemp"/>
@@ -528,7 +528,7 @@
<if-not-empty field="parameters.orderId">
<set field="newEntity.orderId" from-field="parameters.orderId"/>
<else>
- <sequenced-id-to-env sequence-name="OrderHeader" env-name="newEntity.orderId"/>
+ <sequenced-id sequence-name="OrderHeader" field="newEntity.orderId"/>
</else>
</if-not-empty>
<field-to-result field="newEntity.orderId" result-name="orderId"/>
@@ -893,7 +893,7 @@
<if-empty field="parameters.changeUserLogin">
<set field="newEntity.changeUserLogin" from-field="userLogin.userLoginId"/>
</if-empty>
- <sequenced-id-to-env sequence-name="OrderItemChange" env-name="newEntity.orderItemChangeId"/>
+ <sequenced-id sequence-name="OrderItemChange" field="newEntity.orderItemChangeId"/>
<create-value value-field="newEntity"/>
<field-to-result field="newEntity.orderItemChangeId" result-name="orderItemChangeId"/>
</simple-method>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 09:19:35 2008
@@ -46,7 +46,7 @@
<calculate field="partyAcctgPreference.lastQuoteNumber" type="Long"><number value="1"/></calculate>
</else>
</if-not-empty>
- <store-value value-name="partyAcctgPreference"/>
+ <store-value value-field="partyAcctgPreference"/>
<set from-field="partyAcctgPreference.lastQuoteNumber" field="quoteIdTemp"/>
</then>
<else>
@@ -54,7 +54,7 @@
<!-- default to the default sequencing: QTESQ_STANDARD -->
<set from-field="parameters.quoteId" field="quoteIdTemp"/>
<if-empty field="quoteIdTemp">
- <sequenced-id-to-env sequence-name="Quote" env-name="quoteIdTemp"/>
+ <sequenced-id sequence-name="Quote" field="quoteIdTemp"/>
<else>
<!-- check the provided ID -->
<check-id field-name="quoteIdTemp"/>
@@ -99,7 +99,7 @@
<result-to-field result-name="quoteId" field="newEntity.quoteId"/>
</call-service>
<else>
- <sequenced-id-to-env sequence-name="Quote" env-name="newEntity.quoteId"/>
+ <sequenced-id sequence-name="Quote" field="newEntity.quoteId"/>
</else>
</if-not-empty>
<field-to-result field="newEntity.quoteId" result-name="quoteId"/>
@@ -146,7 +146,7 @@
</if-empty>
</if-compare-field>
<set-nonpk-fields map="parameters" value-field="quote"/>
- <store-value value-name="quote"/>
+ <store-value value-field="quote"/>
<check-errors/>
</simple-method>
@@ -228,7 +228,7 @@
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<check-errors/>
<set field="quote.statusId" value="QUO_ORDERED"/>
- <store-value value-name="quote"/>
+ <store-value value-field="quote"/>
<check-errors/>
</simple-method>
@@ -351,7 +351,7 @@
<entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteItem"/>
- <store-value value-name="quoteItem"/>
+ <store-value value-field="quoteItem"/>
<check-errors/>
</simple-method>
@@ -429,7 +429,7 @@
<entity-one entity-name="QuoteAttribute" value-field="quoteAttribute" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteAttribute"/>
- <store-value value-name="quoteAttribute"/>
+ <store-value value-field="quoteAttribute"/>
<check-errors/>
</simple-method>
@@ -468,7 +468,7 @@
<entity-one entity-name="QuoteCoefficient" value-field="quoteCoefficient" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteCoefficient"/>
- <store-value value-name="quoteCoefficient"/>
+ <store-value value-field="quoteCoefficient"/>
<check-errors/>
</simple-method>
@@ -510,7 +510,7 @@
<set value="PROPOSAL" field="newQuote.quoteTypeId"/>
<!-- create a non existing ID -->
- <sequenced-id-to-env sequence-name="Quote" env-name="quoteId"/>
+ <sequenced-id sequence-name="Quote" field="quoteId"/>
<set from-field="quoteId" field="newQuote.quoteId"/>
<set from-field="quoteId" field="newQuoteItem.quoteId"/>
<make-next-seq-id value-name="newQuoteItem" seq-field-name="quoteItemSeqId"/>
@@ -562,7 +562,7 @@
</calculate>
-->
</if-empty>
- <store-value value-name="quoteItem"/>
+ <store-value value-field="quoteItem"/>
<check-errors/>
<field-to-request field="quoteItem.quoteId" request-name="quoteId"/>
</simple-method>
@@ -647,7 +647,7 @@
<iterate list="adjustments" entry="adjustment">
<set from-field="parameters.quoteId" field="adjustment.quoteId"/>
- <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="adjustment.quoteAdjustmentId"/>
+ <sequenced-id sequence-name="QuoteAdjustment" field="adjustment.quoteAdjustmentId"/>
<create-value value-field="adjustment"/>
</iterate>
</simple-method>
@@ -660,7 +660,7 @@
<make-value value-field="newEntity" entity-name="QuoteAdjustment"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="quoteAdjustmentId"/>
+ <sequenced-id sequence-name="QuoteAdjustment" field="quoteAdjustmentId"/>
<now-timestamp-to-env env-name="newEntity.createdDate"/>
<set from-field="quoteAdjustmentId" field="newEntity.quoteAdjustmentId"/>
<set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
@@ -686,7 +686,7 @@
<entity-one entity-name="QuoteAdjustment" value-field="quoteAdjustment" auto-field-map="true"/>
<check-errors/>
<set-nonpk-fields map="parameters" value-field="quoteAdjustment"/>
- <store-value value-name="quoteAdjustment"/>
+ <store-value value-field="quoteAdjustment"/>
<check-errors/>
</simple-method>
@@ -767,7 +767,7 @@
<call-object-method obj-field-name="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field-name="adjustments"/>
<iterate list="adjustments" entry="adjustment">
<set from-field="quote.quoteId" field="adjustment.quoteId"/>
- <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="adjustment.quoteAdjustmentId"/>
+ <sequenced-id sequence-name="QuoteAdjustment" field="adjustment.quoteAdjustmentId"/>
<create-value value-field="adjustment"/>
</iterate>
</then>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 09:19:35 2008
@@ -66,7 +66,7 @@
<set value="CRQ_SUBMITTED" field="newEntity.statusId"/>
</if-empty>
- <sequenced-id-to-env sequence-name="CustRequest" env-name="custRequestId"/>
+ <sequenced-id sequence-name="CustRequest" field="custRequestId"/>
<to-string field-name="custRequestId"/>
<set from-field="custRequestId" field="newEntity.custRequestId"/>
<create-value value-field="newEntity"/>
@@ -180,7 +180,7 @@
<set from-field="nowTimestamp" field="custRequest.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="custRequest.lastModifiedByUserLogin"/>
<set-nonpk-fields map="parameters" value-field="custRequest"/>
- <store-value value-name="custRequest"/>
+ <store-value value-field="custRequest"/>
</simple-method>
<simple-method method-name="createCustRequestAttribute" short-description="Create Customer Request Attribute">
@@ -194,7 +194,7 @@
<set from-field="parameters.attrName" field="lookupPKMap.attrName"/>
<find-by-primary-key entity-name="CustRequestAttribute" map="lookupPKMap" value-field="custRequestAttr"/>
<set-nonpk-fields map="parameters" value-field="custRequestAttr"/>
- <store-value value-name="custRequestAttr"/>
+ <store-value value-field="custRequestAttr"/>
</simple-method>
<simple-method method-name="createCustRequestItem" short-description="Create Customer Request Item">
@@ -216,7 +216,7 @@
<set from-field="parameters.custRequestItemSeqId" field="lookupPKMap.custRequestItemSeqId"/>
<find-by-primary-key entity-name="CustRequestItem" map="lookupPKMap" value-field="custRequestItem"/>
<set-nonpk-fields map="parameters" value-field="custRequestItem"/>
- <store-value value-name="custRequestItem"/>
+ <store-value value-field="custRequestItem"/>
</simple-method>
<simple-method method-name="createCustRequestParty" short-description="Create Customer RequestParty">
@@ -239,13 +239,13 @@
<simple-method method-name="updateCustRequestParty" short-description="Update an existing CustRequestParty">
<entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteCustRequestParty" short-description="Delete Customer CustRequestParty">
<entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/>
<now-timestamp-to-env env-name="thruDate"/>
<set field="lookedUpValue.thruDate" from-field="thruDate"/>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="createCustRequestNote" short-description="Create Customer Request Note">
<make-value value-field="newEntity" entity-name="CustRequestNote"/>
@@ -262,8 +262,8 @@
<entity-one entity-name="NoteData" value-field="lookedUpValueForNoteData"/>
<set-nonpk-fields value-field="lookedUpValueForNoteData" map="parameters"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-name="lookedUpValue"/>
- <store-value value-name="lookedUpValueForNoteData"/>
+ <store-value value-field="lookedUpValue"/>
+ <store-value value-field="lookedUpValueForNoteData"/>
</simple-method>
<simple-method method-name="createCustRequestItemNote" short-description="Create Customer RequestItem Note">
<make-value value-field="newEntity" entity-name="CustRequestItemNote"/>
@@ -413,7 +413,7 @@
<check-errors/>
<else>
<set field="custRequest.statusId" from-field="parameters.statusId"/>
- <store-value value-name="custRequest"/>
+ <store-value value-field="custRequest"/>
</else>
</if-empty>
</if-compare-field>
@@ -489,7 +489,7 @@
<if-empty field="lookedUpValue.thruDate">
<now-timestamp-to-env env-name="lookedUpValue.thruDate"/>
</if-empty>
- <store-value value-name="lookedUpValue"/>
+ <store-value value-field="lookedUpValue"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 09:19:35 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createRequirement" short-description="Create a new requirement">
<make-value value-field="newEntity" entity-name="Requirement"/>
- <sequenced-id-to-env sequence-name="Requirement" env-name="requirementId"/>
+ <sequenced-id sequence-name="Requirement" field="requirementId"/>
<to-string field-name="requirementId"/>
<set from-field="requirementId" field="newEntity.requirementId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 09:19:35 2008
@@ -64,7 +64,7 @@
</if-compare>
</if-empty>
- <sequenced-id-to-env sequence-name="ShoppingList" env-name="newEntity.shoppingListId"/>
+ <sequenced-id sequence-name="ShoppingList" field="newEntity.shoppingListId"/>
<field-to-result field="newEntity.shoppingListId" result-name="shoppingListId"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 09:19:35 2008
@@ -23,7 +23,7 @@
<simple-method method-name="createContactMech" short-description="Create Contact Mechanism">
<make-value value-field="newValue" entity-name="ContactMech"/>
<if-empty field="parameters.contactMechId">
- <sequenced-id-to-env sequence-name="ContactMech" env-name="newValue.contactMechId"/>
+ <sequenced-id sequence-name="ContactMech" field="newValue.contactMechId"/>
<else>
<set field="newValue.contactMechId" from-field="parameters.contactMechId"/>
</else>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 09:19:35 2008
@@ -24,7 +24,7 @@
<!-- Party Invitation Services -->
<simple-method method-name="createPartyInvitation" short-description="Create a PartyInvitation">
<make-value entity-name="PartyInvitation" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="PartyInvitation" env-name="newEntity.partyInvitationId"/>
+ <sequenced-id sequence-name="PartyInvitation" field="newEntity.partyInvitationId"/>
<field-to-result field="newEntity.partyInvitationId" result-name="partyInvitationId"/>
<if-not-empty field="parameters.partyId">
<entity-one entity-name="Person" value-field="person" auto-field-map="false">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 09:19:35 2008
@@ -214,7 +214,7 @@
<simple-method method-name="createPartyClassificationGroup" short-description="create a PartyClassificationGroup">
<log level="verbose" message="in newEntity" />
<make-value entity-name="PartyClassificationGroup" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="PartyClassificationGroup" env-name="newEntity.partyClassificationGroupId"/>
+ <sequenced-id sequence-name="PartyClassificationGroup" field="newEntity.partyClassificationGroupId"/>
<field-to-result field="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<log level="verbose" message="newEntity:${newEntity}" />
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 09:19:35 2008
@@ -25,7 +25,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="parameters.prodCatalogId">
- <sequenced-id-to-env sequence-name="ProdCatalog" env-name="newEntity.prodCatalogId"/>
+ <sequenced-id sequence-name="ProdCatalog" field="newEntity.prodCatalogId"/>
<else>
<set field="newEntity.prodCatalogId" from-field="parameters.prodCatalogId"/>
<check-id field-name="newEntity.prodCatalogId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 09:19:35 2008
@@ -37,7 +37,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="parameters.productCategoryId">
- <sequenced-id-to-env sequence-name="ProductCategory" env-name="newEntity.productCategoryId"/>
+ <sequenced-id sequence-name="ProductCategory" field="newEntity.productCategoryId"/>
<else>
<set field="newEntity.productCategoryId" from-field="parameters.productCategoryId"/>
<check-id field-name="newEntity.productCategoryId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=730189&r1=730188&r2=730189&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Tue Dec 30 09:19:35 2008
@@ -77,7 +77,7 @@
</check-permission>
<check-errors/>
<make-value entity-name="ProductConfigItem" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="ProductConfigItem" env-name="newEntity.configItemId"/>
+ <sequenced-id sequence-name="ProductConfigItem" field="newEntity.configItemId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
<field-to-result field="configItemId" map-name="newEntity"/>
@@ -112,7 +112,7 @@
<make-value entity-name="ProductConfigOption" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id-to-env sequence-name="ProductConfigOption" env-name="newEntity.configOptionId"/>
+ <sequenced-id sequence-name="ProductConfigOption" field="newEntity.configOptionId"/>
<create-value value-field="newEntity"/>
<field-to-result field="newEntity.configItemId" result-name="configItemId"/>
<field-to-result field="newEntity.configOptionId" result-name="configOptionId"/>