Author: jleroux
Date: Tue Dec 30 03:55:26 2008 New Revision: 730104 URL: http://svn.apache.org/viewvc?rev=730104&view=rev Log: <set-pk-fields(.*)map-name => <set-pk-fields$1map <set-pk-fields(.*)value-name => <set-pk-fields$1value-field Modified: 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/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/PaymentMethodServices.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/blog/BlogServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.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/layout/LayoutEvents.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/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.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/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.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/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/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/CategoryContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.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/feature/ProductFeatureServices.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/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/product/supplier/SupplierProductServices.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/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/PortalPageServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.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/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml 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=730104&r1=730103&r2=730104&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 Tue Dec 30 03:55:26 2008 @@ -188,7 +188,7 @@ <!-- create a new AgreementPromoAppl --> <simple-method method-name="createAgreementPromoAppl" short-description="Create an AgreementPromoAppl"> <make-value value-field="newEntity" entity-name="AgreementPromoAppl"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> @@ -214,7 +214,7 @@ <!-- create a new AgreementProductAppl --> <simple-method method-name="createAgreementProductAppl" short-description="Create an AgreementProductAppl"> <make-value value-field="newEntity" entity-name="AgreementProductAppl"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> @@ -240,7 +240,7 @@ <!-- create a new AgreementPartyApplic --> <simple-method method-name="createAgreementPartyApplic" short-description="Create an AgreementPartyApplic"> <make-value value-field="newEntity" entity-name="AgreementPartyApplic"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> @@ -266,7 +266,7 @@ <!-- create a new AgreementGeographicalApplic --> <simple-method method-name="createAgreementGeographicalApplic" short-description="Create an AgreementGeographicalApplic"> <make-value value-field="newEntity" entity-name="AgreementGeographicalApplic"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> @@ -292,14 +292,14 @@ <!-- Agreement Role --> <simple-method method-name="createAgreementRole" short-description="Create an Agreement Role"> <make-value entity-name="AgreementRole" value-field="newEntity"/> - <set-pk-fields value-name="newEntity" map-name="parameters"/> + <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateAgreementRole" short-description="Update an Agreement Role"> <entity-one entity-name="AgreementRole" value-name="lookedUpValue"/> - <set-pk-fields value-name="lookedUpValue" map-name="parameters"/> + <set-pk-fields value-field="lookedUpValue" map="parameters"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -316,7 +316,7 @@ <check-errors/> <else> <make-value value-field="newEntity" entity-name="AgreementWorkEffortAppl"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </else> </if-not-empty> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -40,7 +40,7 @@ </simple-method> <simple-method method-name="createWorkEffortCostCalc" short-description="Create a WorkEffortCostCalc entry"> <make-value entity-name="WorkEffortCostCalc" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -36,7 +36,7 @@ </if-empty> <make-value value-field="newEntity" entity-name="FinAccount"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.finAccountId"> @@ -152,7 +152,7 @@ </if-not-empty> <make-value entity-name="FinAccountStatus" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set field="newEntity.statusDate" from-field="nowTimestamp"/> <create-value value-name="newEntity"/> @@ -192,7 +192,7 @@ <!-- FinAccountRole Services --> <simple-method method-name="createFinAccountRole" short-description="Create a Financial Account Role"> <make-value value-field="newEntity" entity-name="FinAccountRole"/> - <set-pk-fields value-name="newEntity" map-name="parameters"/> + <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> <if-empty field="newEntity.fromDate"> @@ -329,7 +329,7 @@ <simple-method method-name="createFinAccountTypeGlAccount" short-description="Create an FinAccountTypeGlAccount"> <make-value value-field="newEntity" entity-name="FinAccountTypeGlAccount"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -348,7 +348,7 @@ <simple-method method-name="createVarianceReasonGlAccount" short-description="Create a Variance Reason Gl Account"> <make-value entity-name="VarianceReasonGlAccount" value-field="newEntity" /> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> 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=730104&r1=730103&r2=730104&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 Tue Dec 30 03:55:26 2008 @@ -65,7 +65,7 @@ <!-- add a product to a fixed Asset --> <simple-method method-name="addFixedAssetProduct" short-description="Add Product to FixedAsset"> <make-value value-field="newEntity" entity-name="FixedAssetProduct"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.fromDate"> @@ -102,8 +102,8 @@ <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> <make-value value-field="excDayPKMap" entity-name="TechDataCalendarExcDay"/> - <set-pk-fields field-name= "calendarId" map-name="fixedAsset" value-name="excDayPKMap"/> - <set-pk-fields fieldName= "exceptionDateStartTime" map-name="parameters" value-name="excDayPKMap"/> + <set-pk-fields field-name= "calendarId" map="fixedAsset" value-field="excDayPKMap"/> + <set-pk-fields fieldName= "exceptionDateStartTime" map="parameters" value-field="excDayPKMap"/> <find-by entity-name="TechDataCalendarExcDay" map-name="excDayPKMap" value-name="lookedUpValue"/> <set-nonpk-fields field-name="capacity" map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -127,7 +127,7 @@ <make-value value-field="newEntity" entity-name="FixedAssetStdCost"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <!-- finally create the record (should not exist already)--> <create-value value-name="newEntity"/> @@ -150,7 +150,7 @@ <simple-method method-name="createFixedAssetIdent" short-description="Create an FixedAssetIdent"> <make-value value-field="newEntity" entity-name="FixedAssetIdent"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateFixedAssetIdent" short-description="Update an existing FixedAssetIdent"> @@ -167,7 +167,7 @@ <simple-method method-name="createFixedAssetRegistration" short-description="Create FixedAsset Registration"> <make-value value-field="newEntity" entity-name="FixedAssetRegistration"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -186,7 +186,7 @@ <!-- create/update/delete FixedAssetMaint --> <simple-method method-name="createFixedAssetMaint" short-description="create a FixedAssetMaint"> <make-value entity-name="FixedAssetMaint" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-name="newEntity" seq-field-name="maintHistSeqId"/> <!-- this finds the next sub-sequence ID --> <field-to-result field-name="newEntity.maintHistSeqId" result-name="maintHistSeqId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -306,7 +306,7 @@ <!-- create/update/delete FixedAssetMeter --> <simple-method method-name="createFixedAssetMeter" short-description="Create a Fixed Asset Meter Reading"> <make-value entity-name="FixedAssetMeter" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> <check-errors/> @@ -457,7 +457,7 @@ <entity-condition list-name="maintMeterList" entity-name="FixedAssetMaintMeter"/> <iterate list="maintMeterList" entry="maintMeter"> <make-value value-field="newEntity" entity-name="FixedAssetMeter"/> - <set-pk-fields map-name="maintMeter" value-name="newEntity"/> + <set-pk-fields map="maintMeter" value-field="newEntity"/> <set-nonpk-fields map-name="maintMeter" value-name="newEntity"/> <set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/> <entity-one entity-name="FixedAssetMeter" value-name="lookedUpValue" auto-field-map="false"> @@ -506,7 +506,7 @@ <check-errors/> <make-value entity-name="FixedAssetMaintOrder" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -518,7 +518,7 @@ <!-- ==============Party Fixed Asset Assignment============= --> <simple-method method-name="createPartyFixedAssetAssignment" short-description="Associate Party to Fixed Asset"> <make-value entity-name="PartyFixedAssetAssignment" value-field="newEntity"/> - <set-pk-fields value-name="newEntity" map-name="parameters"/> + <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields value-name="newEntity" map-name="parameters"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -192,7 +192,7 @@ <simple-method method-name="getInvoice" short-description="Retrieve an invoice and the items"> <!-- find the invoice record --> <make-value value-field="lookupPKMap" entity-name="Invoice"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="invoiceValue"/> <field-to-result field-name="invoiceValue" result-name="invoice"/> <!-- and the items --> @@ -204,7 +204,7 @@ <call-simple-method method-name="InvoiceStatusInProgress"/> <!-- find the current record --> <make-value value-field="lookupPKMap" entity-name="Invoice"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="lookedUpValue"/> <!-- only try to update content if the status is in process.... --> @@ -249,7 +249,7 @@ <set field="invoiceId" from-field="parameters.invoiceId"/> <call-simple-method method-name="InvoiceStatusInProgress"/> <make-value value-field="newEntity" entity-name="InvoiceItem"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <if-empty field="newEntity.invoiceItemSeqId"> <make-next-seq-id value-name="newEntity" seq-field-name="invoiceItemSeqId"/> <!-- this finds the next sub-sequence ID --> @@ -283,7 +283,7 @@ short-description="Update an existing Invoice Item"> <call-simple-method method-name="InvoiceStatusInProgress"/> <make-value value-field="lookupPKMap" entity-name="InvoiceItem"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="InvoiceItem" map="lookupPKMap" value-field="lookedUpValue"/> <clone-value value-name="lookedUpValue" new-value-name="savedValue"/> @@ -422,7 +422,7 @@ <call-simple-method method-name="InvoiceStatusInProgress"/> <make-value value-field="newEntity" entity-name="InvoiceRole"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.datetimePerformed"><now-timestamp-to-env env-name="newEntity.datetimePerformed"/></if-empty> <create-value value-name="newEntity"/> </simple-method> @@ -475,7 +475,7 @@ <make-value value-field="newEntity" entity-name="InvoiceStatus"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.statusDate"> <now-timestamp-to-env env-name="newEntity.statusDate"/> @@ -541,7 +541,7 @@ </simple-method> <simple-method method-name="createInvoiceContactMech" short-description="Create a ContactMech for an invoice"> <make-value value-field="invoiceContactMech" entity-name="InvoiceContactMech"/> - <set-pk-fields map-name="parameters" value-name="invoiceContactMech"/> + <set-pk-fields map="parameters" value-field="invoiceContactMech"/> <create-value value-name="invoiceContactMech"/> <field-to-result field-name="contactMechId" map-name="invoiceContactMech"/> </simple-method> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -66,7 +66,7 @@ <simple-method method-name="createAcctgTransEntry" short-description="Add Entry To AcctgTrans"> <make-value entity-name="AcctgTransEntry" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <entity-one entity-name="AcctgTrans" value-name="acctgTrans"/> <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"> <add-error><fail-property resource="AccountingUiLabels" property="AccountingTransactionHasBeenAlreadyPosted"/></add-error> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -38,7 +38,7 @@ </simple-method> <simple-method method-name="updateBillingAccount" short-description="Update Billing Account"> <make-value value-field="lookupPKMap" entity-name="BillingAccount"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccount" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -46,7 +46,7 @@ <simple-method method-name="createBillingAccountRole" short-description="Create Billing Account Role"> <make-value value-field="newEntity" entity-name="BillingAccountRole"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> @@ -55,14 +55,14 @@ </simple-method> <simple-method method-name="updateBillingAccountRole" short-description="Update Billing Account Role"> <make-value value-field="lookupPKMap" entity-name="BillingAccountRole"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountRole" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeBillingAccountRole" short-description="Remove Billing Account Role"> <make-value value-field="lookupPKMap" entity-name="BillingAccountRole"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -79,14 +79,14 @@ </simple-method> <simple-method method-name="updateBillingAccountTerm" short-description="Update Billing Account Term"> <make-value value-field="lookupPKMap" entity-name="BillingAccountTerm"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountTerm" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeBillingAccountTerm" short-description="Remove Billing Account Term"> <make-value entity-name="BillingAccountTerm" value-field="lookupPKMap"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="BillingAccountTerm" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=730104&r1=730103&r2=730104&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml Tue Dec 30 03:55:26 2008 @@ -54,7 +54,7 @@ <simple-method method-name="setPaymentMethodAddress" short-description="Set the initial payment method address"> <make-value value-field="lookupPKMap" entity-name="PaymentMethod"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="PaymentMethod" map="lookupPKMap" value-field="lookedUpValue"/> <if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="CREDIT_CARD"> <find-by-primary-key entity-name="CreditCard" map="lookupPKMap" value-field="mainValue"/> @@ -104,7 +104,7 @@ <!--CreateCreditCardTypeGlAccount methods --> <simple-method method-name="createCreditCardTypeGlAccount" short-description="Create a Credit Card Gl Account"> <make-value entity-name="CreditCardTypeGlAccount" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -65,7 +65,7 @@ </simple-method> <simple-method method-name="updatePayment" short-description="Update a Payment"> <make-value entity-name="Payment" value-field="lookupPayment"/> - <set-pk-fields value-name="lookupPayment" map-name="parameters"/> + <set-pk-fields value-field="lookupPayment" map="parameters"/> <find-by-primary-key entity-name="Payment" map="lookupPayment" value-field="payment"/> <if> 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=730104&r1=730103&r2=730104&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 Tue Dec 30 03:55:26 2008 @@ -63,7 +63,7 @@ </if-not-empty> <make-value entity-name="RateAmount" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <now-timestamp-to-env env-name="newEntity.fromDate"/> <clear-field field-name="newEntity.thruDate"/> @@ -308,7 +308,7 @@ </if-not-empty> <make-value value-field="newEntity" entity-name="PartyRate"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <call-simple-method method-name="checkOtherDefaultRate"/> @@ -355,11 +355,11 @@ <entity-condition entity-name="OldEmplPositionTypeRate" list-name="posRates"/> <iterate entry="posRate" list="posRates"> <make-value value-field="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/> - <set-pk-fields value-name="posRate" map-name="emplPositionTypeRate"/> + <set-pk-fields value-field="posRate" map="emplPositionTypeRate"/> <set-nonpk-fields value-name="posRate" map-name="emplPositionTypeRate"/> <create-value value-name="emplPositionTypeRate"/> <make-value value-field="rateAmount" entity-name="RateAmount"/> - <set-pk-fields value-name="posRate" map-name="rateAmount"/> + <set-pk-fields value-field="posRate" map="rateAmount"/> <set-nonpk-fields value-name="posRate" map-name="rateAmount"/> <set field="rateAmount.workeffortId" value="_NA_"/> <set field="rateAmount.partyId" value="_NA_"/> @@ -369,11 +369,11 @@ <entity-condition entity-name="OldPartyRate" list-name="partyRates"/> <iterate entry="oldPartyRate" list="oldPartyRates"> <make-value value-field="partyRate" entity-name="PartyRate"/> - <set-pk-fields value-name="oldPartyRate" map-name="partyRate"/> + <set-pk-fields value-field="oldPartyRate" map="partyRate"/> <set-nonpk-fields value-name="oldPartyRate" map-name="partyRate"/> <create-value value-name="partyRate"/> <make-value value-field="rateAmount" entity-name="RateAmount"/> - <set-pk-fields value-name="oldPartyRate" map-name="rateAmount"/> + <set-pk-fields value-field="oldPartyRate" map="rateAmount"/> <set-nonpk-fields value-name="oldPartyRate" map-name="rateAmount"/> <set field="rateAmount.workeffortId" value="_NA_"/> <set field="rateAmount.emplPositionTypeId" value="_NA_"/> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -28,7 +28,7 @@ <check-errors/> <make-value entity-name="TaxAuthority" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -57,7 +57,7 @@ <check-errors/> <make-value entity-name="TaxAuthorityAssoc" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -87,7 +87,7 @@ <check-errors/> <make-value entity-name="TaxAuthorityCategory" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -128,7 +128,7 @@ <check-errors/> <make-value entity-name="TaxAuthorityGlAccount" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -193,7 +193,7 @@ <check-errors/> <make-value entity-name="PartyTaxAuthInfo" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=730104&r1=730103&r2=730104&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Tue Dec 30 03:55:26 2008 @@ -182,7 +182,7 @@ <iterate entry="view" list="unfilteredList"> <make-value entity-name="Content" value-field="content"/> <set-nonpk-fields value-name="content" map-name="view"/> - <set-pk-fields value-name="content" map-name="view"/> + <set-pk-fields value-field="content" map="view"/> <set field="mapIn.currentContent" from-field="content"/> <log level="info" message="mapIn: ${mapIn}"/> <call-service service-name="checkContentPermission" in-map-name="mapIn"> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -334,7 +334,7 @@ <check-errors/> <make-value entity-name="ContentRevision" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentRevision" short-description="Update ContentRevision"> @@ -343,7 +343,7 @@ </check-permission> <check-errors/> <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentRevision" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -354,7 +354,7 @@ </check-permission> <check-errors/> <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentRevision" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -366,7 +366,7 @@ <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentRevisionItem" short-description="Update ContentRevisionItem"> @@ -375,7 +375,7 @@ </check-permission> <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentRevisionItem" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -386,7 +386,7 @@ </check-permission> <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentRevisionItem" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -426,14 +426,14 @@ </call-class-method> <log level="info" message="incrementedSeq(1): ${incrementedSeq}"/> <log level="info" message="numericPadding(1): ${numericPadding}"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set field="newEntity.contentRevisionSeqId" from-field="paddedSeqId"/> <log level="info" message="ContentRevision(1): ${newEntity}"/> <create-value value-name="newEntity"/> <if-not-empty field="parameters.itemContentId"> <make-value entity-name="ContentRevisionItem" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.contentRevisionSeqId" from-field="paddedSeqId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> @@ -492,7 +492,7 @@ <check-errors/> <make-value entity-name="ContentApproval" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="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"/> </if-empty> @@ -507,7 +507,7 @@ </check-permission> <check-errors/> <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentApproval" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -518,7 +518,7 @@ </check-permission> <check-errors/> <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentApproval" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?rev=730104&r1=730103&r2=730104&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Tue Dec 30 03:55:26 2008 @@ -25,7 +25,7 @@ <log level="always" message="parameters: ${parameters}"/> <make-value entity-name="Content" value-field="currentContent"/> - <set-pk-fields map-name="parameters" value-name="currentContent"/> + <set-pk-fields map="parameters" value-field="currentContent"/> <set-nonpk-fields map-name="parameters" value-name="currentContent"/> <call-map-processor in-map-name="currentContent" out-map-name="currentContent"> <simple-map-processor name="newDateContent"> @@ -89,7 +89,7 @@ <log level="always" message="parameters: ${parameters}"/> <make-value entity-name="Content" value-field="currentContent"/> - <set-pk-fields map-name="parameters" value-name="currentContent"/> + <set-pk-fields map="parameters" value-field="currentContent"/> <set-nonpk-fields map-name="parameters" value-name="currentContent"/> <call-map-processor in-map-name="currentContent" out-map-name="currentContent"> <simple-map-processor name="newDateContent"> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -21,7 +21,7 @@ <simple-method method-name="createContentAndPurpose" short-description="Create Content And Purpose" login-required="false"> <make-value entity-name="Content" value-field="currentContent"/> - <set-pk-fields map-name="parameters" value-name="currentContent"/> + <set-pk-fields map="parameters" value-field="currentContent"/> <set-nonpk-fields map-name="parameters" value-name="currentContent"/> <if-empty field="currentContent.contentId"> <make-next-seq-id seq-field-name="contentId" value-name="currentContent"/> 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=730104&r1=730103&r2=730104&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 03:55:26 2008 @@ -25,7 +25,7 @@ <simple-method method-name="createContent" short-description="Create a Content Record"> <make-value value-field="content" entity-name="Content"/> <set-nonpk-fields value-name="content" map-name="parameters"/> - <set-pk-fields value-name="content" map-name="parameters"/> + <set-pk-fields value-field="content" map="parameters"/> <if-empty field="content.contentId"> <sequenced-id-to-env sequence-name="Content" env-name="contentId"/> @@ -65,7 +65,7 @@ </simple-method> <simple-method method-name="removeContent" short-description="Remove a Content Record"> <make-value entity-name="Content" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="Content" map="lookupKeyValue" value-field="content"/> <remove-value value-name="content"/> @@ -75,7 +75,7 @@ <simple-method method-name="createContentAssoc" short-description="Create a ContntAssoc Record"> <make-value value-field="assoc" entity-name="ContentAssoc"/> <set-nonpk-fields value-name="assoc" map-name="parameters"/> - <set-pk-fields value-name="assoc" map-name="parameters"/> + <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"/> @@ -105,7 +105,7 @@ </simple-method> <simple-method method-name="removeContentAssoc" short-description="Remove a Content Assoc Record"> <make-value entity-name="ContentAssoc" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentAssoc" map="lookupKeyValue" value-field="assoc"/> <remove-value value-name="assoc"/> @@ -229,19 +229,19 @@ <simple-method method-name="createContentMetaData" short-description="Create Content Meta Data"> <make-value entity-name="ContentMetaData" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentMetaData" short-description="Update Content Meta Data"> <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentMetaData" short-description="Remove Content Meta Data"> <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -252,7 +252,7 @@ <now-timestamp-to-env env-name="parameters.fromDate"/> </if-empty> <make-value value-field="partyRolePK" entity-name="PartyRole"/> - <set-pk-fields value-name="partyRolePK" map-name="parameters"/> + <set-pk-fields value-field="partyRolePK" map="parameters"/> <find-by-primary-key entity-name="PartyRole" map="partyRolePK" value-field="partyRole"/> <if-empty field="partyRole"> <make-value entity-name="PartyRole" map-name="partyRolePK" value-field="partyRole"/> @@ -261,7 +261,7 @@ <check-errors/> <make-value entity-name="ContentRole" value-field="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <find-by-primary-key entity-name="ContentRole" map="newEntity" value-field="contentRole"/> <if-empty field="contentRole"> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -271,7 +271,7 @@ </simple-method> <simple-method method-name="updateContentRole" short-description="Update Content Role"> <make-value entity-name="ContentRole" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentRole" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -290,7 +290,7 @@ </simple-method> <simple-method method-name="removeContentRole" short-description="Remove Content Role"> <make-value entity-name="ContentRole" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentRole" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -300,20 +300,20 @@ <simple-method method-name="createContentType" short-description="Create Content Type"> <make-value entity-name="ContentType" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> <field-to-result map-name="newEntity" field-name="contentTypeId" /> </simple-method> <simple-method method-name="updateContentType" short-description="Update Content Type"> <make-value entity-name="ContentType" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentType" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentType" short-description="Remove Content Type"> <make-value entity-name="ContentType" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -322,12 +322,12 @@ <simple-method method-name="createContentTypeAttr" short-description="Create Content TypeAttr"> <make-value entity-name="ContentTypeAttr" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="removeContentTypeAttr" short-description="Remove Content TypeAttr"> <make-value entity-name="ContentTypeAttr" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentTypeAttr" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -336,20 +336,20 @@ <simple-method method-name="createContentAssocType" short-description="Create Content AssocType"> <make-value entity-name="ContentAssocType" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> <field-to-result map-name="newEntity" field-name="contentAssocTypeId" /> </simple-method> <simple-method method-name="updateContentAssocType" short-description="Update Content AssocType"> <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentAssocType" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentAssocType" short-description="Remove Content AssocType"> <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentAssocType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -358,7 +358,7 @@ <simple-method method-name="createContentPurposeType" short-description="Create Content PurposeType"> <make-value entity-name="ContentPurposeType" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.contentPurposeTypeId"> <make-next-seq-id seq-field-name="contentPurposeTypeId" value-name="newEntity"/> </if-empty> @@ -367,14 +367,14 @@ </simple-method> <simple-method method-name="updateContentPurposeType" short-description="Update Content PurposeType"> <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurposeType" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentPurposeType" short-description="Remove Content PurposeType"> <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurposeType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -383,20 +383,20 @@ <simple-method method-name="createContentAssocPredicate" short-description="Create Content AssocPredicate"> <make-value entity-name="ContentAssocPredicate" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> <field-to-result map-name="newEntity" field-name="contentAssocPredicateId" /> </simple-method> <simple-method method-name="updateContentAssocPredicate" short-description="Update Content AssocPredicate"> <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentAssocPredicate" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentAssocPredicate" short-description="Remove Content AssocPredicate"> <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentAssocPredicate" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -405,19 +405,19 @@ <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation"> <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation"> <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation"> <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -426,19 +426,19 @@ <simple-method method-name="createContentPurpose" short-description="Create Content Purpose"> <make-value entity-name="ContentPurpose" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentPurpose" short-description="Update Content Purpose"> <make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurpose" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentPurpose" short-description="Remove Content Purpose"> <make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurpose" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -452,19 +452,19 @@ <simple-method method-name="createContentOperation" short-description="Create Content Operation"> <make-value entity-name="ContentOperation" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentOperation" short-description="Update Content Operation"> <make-value entity-name="ContentOperation" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentOperation" short-description="Remove Content Operation"> <make-value entity-name="ContentOperation" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -473,19 +473,19 @@ <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation"> <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation"> <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation"> <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -494,19 +494,19 @@ <simple-method method-name="createContentAttribute" short-description="Create Content Attribute"> <make-value entity-name="ContentAttribute" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentAttribute" short-description="Update Content Attribute"> <make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentAttribute" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="removeContentAttribute" short-description="Remove Content Attribute"> <make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentAttribute" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -515,12 +515,12 @@ <simple-method method-name="createContentMetaData" short-description="Create Content MetaData"> <make-value entity-name="ContentMetaData" value-field="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-name="newEntity"/> </simple-method> <simple-method method-name="updateContentMetaData" short-description="Update Content MetaData"> <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -528,7 +528,7 @@ <simple-method method-name="removeContentMetaData" short-description="Remove Content MetaData"> <check-errors/> <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/> - <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> + <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -841,7 +841,7 @@ --> <simple-method method-name="createCommEventContentAssoc" short-description="Create CommEventContentAssoc"> <make-value entity-name="CommEventContentAssoc" value-field="commEventContentAssoc" /> - <set-pk-fields value-name="commEventContentAssoc" map-name="parameters"/> + <set-pk-fields value-field="commEventContentAssoc" map="parameters"/> <set-nonpk-fields value-name="commEventContentAssoc" map-name="parameters"/> <if-empty field="commEventContentAssoc.fromDate"> <now-timestamp-to-env env-name="commEventContentAssoc.fromDate"/> @@ -854,7 +854,7 @@ --> <simple-method method-name="updateCommEventContentAssoc" short-description="Create CommEventContentAssoc"> <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc" /> - <set-pk-fields value-name="pkCommEventContentAssoc" map-name="parameters"/> + <set-pk-fields value-field="pkCommEventContentAssoc" map="parameters"/> <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> <if-empty field="commEventContentAssoc"> <add-error> @@ -867,7 +867,7 @@ <simple-method method-name="removeCommEventContentAssoc" short-description="Delete CommEventContentAssoc"> <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc" /> - <set-pk-fields value-name="pkCommEventContentAssoc" map-name="parameters"/> + <set-pk-fields value-field="pkCommEventContentAssoc" map="parameters"/> <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> <if-empty field="commEventContentAssoc"> <add-error> |
Free forum by Nabble | Edit this page |