svn commit: r730101 [1/3] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730101 [1/3] - in /ofbiz/trunk: applications/accounting/script
 
|
Author: jleroux
Date: Tue Dec 30 03:51:58 2008 New Revision: 730101 URL: http://svn.apache.org/viewvc?rev=730101&view=rev Log: <find-by-primary-key(.*)map-name => <find-by-primary-key$1map Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.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/content/script/org/ofbiz/content/compdoc/CompDocServices.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/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml ofbiz/trunk/applications/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/tracking/TrackingCodeServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.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/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/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/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/permission/WorkEffortPermissionServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.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/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730101&r1=730100&r2=730101&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:51:58 2008 @@ -193,7 +193,7 @@ <!-- find the invoice record --> <make-value value-field="lookupPKMap" entity-name="Invoice"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="Invoice" map-name="lookupPKMap" value-field="invoiceValue"/> + <find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="invoiceValue"/> <field-to-result field-name="invoiceValue" result-name="invoice"/> <!-- and the items --> <get-related value-name="invoiceValue" relation-name="InvoiceItem" list-name="invoiceItemValues"/> @@ -205,7 +205,7 @@ <!-- find the current record --> <make-value value-field="lookupPKMap" entity-name="Invoice"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="Invoice" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="Invoice" map="lookupPKMap" value-field="lookedUpValue"/> <!-- only try to update content if the status is in process.... --> <if-compare field="lookedUpValue.statusId" operator="equals" value="INVOICE_IN_PROCESS"> @@ -285,7 +285,7 @@ <make-value value-field="lookupPKMap" entity-name="InvoiceItem"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="InvoiceItem" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="InvoiceItem" map="lookupPKMap" value-field="lookedUpValue"/> <clone-value value-name="lookedUpValue" new-value-name="savedValue"/> <!-- set all parameters --> 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=730101&r1=730100&r2=730101&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:51:58 2008 @@ -39,7 +39,7 @@ <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"/> - <find-by-primary-key entity-name="BillingAccount" map-name="lookupPKMap" value-field="lookedUpValue"/> + <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"/> </simple-method> @@ -56,14 +56,14 @@ <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"/> - <find-by-primary-key entity-name="BillingAccountRole" map-name="lookupPKMap" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="BillingAccountRole" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="BillingAccountRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="createBillingAccountTerm" short-description="Create Billing Account Term"> @@ -80,14 +80,14 @@ <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"/> - <find-by-primary-key entity-name="BillingAccountTerm" map-name="lookupPKMap" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="BillingAccountTerm" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="BillingAccountTerm" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> </simple-methods> 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=730101&r1=730100&r2=730101&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:51:58 2008 @@ -55,9 +55,9 @@ <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"/> - <find-by-primary-key entity-name="PaymentMethod" map-name="lookupPKMap" value-field="lookedUpValue"/> + <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-name="lookupPKMap" value-field="mainValue"/> + <find-by-primary-key entity-name="CreditCard" map="lookupPKMap" value-field="mainValue"/> <clone-value value-name="mainValue" new-value-name="savedValue"/> <set-nonpk-fields map-name="parameters" value-name="mainValue"/> <if-compare-field field="mainValue" to-field="savedValue" operator="not-equals" type="Object"> @@ -65,7 +65,7 @@ </if-compare-field> </if-compare> <if-compare field="lookedUpValue.paymentMethodTypeId" operator="equals" value="EFT_ACCOUNT"> - <find-by-primary-key entity-name="CreditCard" map-name="lookupPKMap" value-field="mainValue"/> + <find-by-primary-key entity-name="CreditCard" map="lookupPKMap" value-field="mainValue"/> <clone-value value-name="mainValue" new-value-name="savedValue"/> <set-nonpk-fields map-name="parameters" value-name="mainValue"/> <if-compare-field field="mainValue" to-field="savedValue" operator="not-equals" type="Object"> 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=730101&r1=730100&r2=730101&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:51:58 2008 @@ -67,7 +67,7 @@ <make-value entity-name="Payment" value-field="lookupPayment"/> <set-pk-fields value-name="lookupPayment" map-name="parameters"/> - <find-by-primary-key entity-name="Payment" map-name="lookupPayment" value-field="payment"/> + <find-by-primary-key entity-name="Payment" map="lookupPayment" value-field="payment"/> <if> <condition> <and> 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=730101&r1=730100&r2=730101&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:51:58 2008 @@ -344,7 +344,7 @@ <check-errors/> <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ContentRevision" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> </simple-method> @@ -355,7 +355,7 @@ <check-errors/> <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ContentRevision" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentRevision" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <!-- Methods for ContentRevisionItem --> @@ -376,7 +376,7 @@ <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ContentRevisionItem" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> </simple-method> @@ -387,7 +387,7 @@ <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ContentRevisionItem" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentRevisionItem" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <!-- Methods for ContentRevision and ContentRevisionItem --> @@ -508,7 +508,7 @@ <check-errors/> <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ContentApproval" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> </simple-method> @@ -519,7 +519,7 @@ <check-errors/> <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ContentApproval" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentApproval" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -766,7 +766,7 @@ <simple-method method-name="hasApprovalPermission" short-description="Determine ContentApproval permission from passed value"> <make-value entity-name="ContentApproval" value-field="contentApprovalPK"/> <set field="contentApprovalPK.contentApprovalId" from-field="parameters.contentApprovalId"/> - <find-by-primary-key entity-name="ContentApproval" value-field="contentApproval" map-name="contentApprovalPK" use-cache="true"/> + <find-by-primary-key entity-name="ContentApproval" value-field="contentApproval" map="contentApprovalPK" use-cache="true"/> <set field="partyId" from-field="parameters.userLogin.partyId"/> <log level="info" message="contentApproval: ${contentApproval}"/> <if-compare field="contentApproval.partyId" value="${partyId}" operator="equals"> 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=730101&r1=730100&r2=730101&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:51:58 2008 @@ -66,7 +66,7 @@ <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"/> - <find-by-primary-key entity-name="Content" map-name="lookupKeyValue" value-field="content"/> + <find-by-primary-key entity-name="Content" map="lookupKeyValue" value-field="content"/> <remove-value value-name="content"/> </simple-method> @@ -106,7 +106,7 @@ <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"/> - <find-by-primary-key entity-name="ContentAssoc" map-name="lookupKeyValue" value-field="assoc"/> + <find-by-primary-key entity-name="ContentAssoc" map="lookupKeyValue" value-field="assoc"/> <remove-value value-name="assoc"/> </simple-method> @@ -199,8 +199,8 @@ <set from-field="currentContent" field="context.currentContent"/> <set from-field="parameters.contentIdFrom" field="pk.contentId"/> <set from-field="parameters.userLogin" field="context.userLogin"/> - <find-by-primary-key value-field="currentContent" entity-name="Content" map-name="pk" /> - <find-by-primary-key value-field="fromContent" entity-name="Content" map-name="pk" /> + <find-by-primary-key value-field="currentContent" entity-name="Content" map="pk" /> + <find-by-primary-key value-field="fromContent" entity-name="Content" map="pk" /> <if-compare field="permissionStatus" operator="equals" type="String" value="granted"> <make-value entity-name="ContentAssoc" value-field="newContentAssoc"/> @@ -235,14 +235,14 @@ <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"/> - <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -253,7 +253,7 @@ </if-empty> <make-value value-field="partyRolePK" entity-name="PartyRole"/> <set-pk-fields value-name="partyRolePK" map-name="parameters"/> - <find-by-primary-key entity-name="PartyRole" map-name="partyRolePK" value-field="partyRole"/> + <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"/> <create-value value-name="partyRole"/> @@ -262,7 +262,7 @@ <make-value entity-name="ContentRole" value-field="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> - <find-by-primary-key entity-name="ContentRole" map-name="newEntity" value-field="contentRole"/> + <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"/> <create-value value-name="newEntity"/> @@ -272,7 +272,7 @@ <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"/> - <find-by-primary-key entity-name="ContentRole" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> </simple-method> @@ -291,7 +291,7 @@ <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"/> - <find-by-primary-key entity-name="ContentRole" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentRole" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -307,14 +307,14 @@ <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"/> - <find-by-primary-key entity-name="ContentType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -328,7 +328,7 @@ <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"/> - <find-by-primary-key entity-name="ContentTypeAttr" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentTypeAttr" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -343,14 +343,14 @@ <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"/> - <find-by-primary-key entity-name="ContentAssocType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentAssocType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentAssocType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -368,14 +368,14 @@ <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"/> - <find-by-primary-key entity-name="ContentPurposeType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentPurposeType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentPurposeType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -390,14 +390,14 @@ <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"/> - <find-by-primary-key entity-name="ContentAssocPredicate" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentAssocPredicate" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentAssocPredicate" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -411,14 +411,14 @@ <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"/> - <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -432,14 +432,14 @@ <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"/> - <find-by-primary-key entity-name="ContentPurpose" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentPurpose" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentPurpose" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="updateSingleContentPurpose" short-description="Updates the purpose making sure there is only one"> @@ -458,14 +458,14 @@ <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"/> - <find-by-primary-key entity-name="ContentOperation" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentOperation" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -479,14 +479,14 @@ <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"/> - <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -500,14 +500,14 @@ <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"/> - <find-by-primary-key entity-name="ContentAttribute" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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"/> - <find-by-primary-key entity-name="ContentAttribute" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentAttribute" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -521,7 +521,7 @@ <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"/> - <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <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> @@ -529,7 +529,7 @@ <check-errors/> <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -855,7 +855,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"/> - <find-by-primary-key value-field="commEventContentAssoc" map-name="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> + <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> <if-empty field="commEventContentAssoc"> <add-error> <fail-message message="CommEventContentAssoc entity not found for update, communicationEventId: ${parameters.communicationEventId} and contentId: ${parameters.contentId}"/> @@ -868,7 +868,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"/> - <find-by-primary-key value-field="commEventContentAssoc" map-name="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> + <find-by-primary-key value-field="commEventContentAssoc" map="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/> <if-empty field="commEventContentAssoc"> <add-error> <fail-message message="CommEventContentAssoc entity not found for removal, communicationEventId: ${parameters.communicationEventId} and contentId: ${parameters.contentId}"/> 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=730101&r1=730100&r2=730101&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 03:51:58 2008 @@ -58,7 +58,7 @@ <simple-method method-name="updateDataResource" short-description="Update a Data Resource"> <make-value entity-name="DataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResource" map="lookupKeyValue" value-field="lookedUpValue"/> <to-string map-name="parameters" field-name="locale" /> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> @@ -74,7 +74,7 @@ <simple-method method-name="deleteDataResource" short-description="Delete a Data Resource"> <make-value entity-name="DataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResource" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -90,14 +90,14 @@ <simple-method method-name="updateDataCategory" short-description="Update a Data Category"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataCategory" 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="deleteDataCategory" short-description="Delete a Data Category"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -117,7 +117,7 @@ <make-value entity-name="DataResourceMetaData" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceMetaData" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -127,7 +127,7 @@ <make-value entity-name="DataResourceMetaData" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceMetaData" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceMetaData" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -147,7 +147,7 @@ <make-value entity-name="DataResourcePurpose" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourcePurpose" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourcePurpose" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -157,7 +157,7 @@ <make-value entity-name="DataResourcePurpose" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourcePurpose" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourcePurpose" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -177,14 +177,14 @@ <simple-method method-name="updateDataResourceRole" short-description="Update Data Resource Role"> <make-value entity-name="DataResourceRole" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceRole" 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="removeDataResourceRole" short-description="Remove Data Resource Role"> <make-value entity-name="DataResourceRole" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceRole" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -199,14 +199,14 @@ <simple-method method-name="updateDataCategory" short-description="Update Data Category"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataCategory" 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="removeDataCategory" short-description="Remove Data DateCategory"> <make-value entity-name="DataCategory" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -221,14 +221,14 @@ <simple-method method-name="updateDataResourceType" short-description="Update Data Resource Type"> <make-value entity-name="DataResourceType" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceType" 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="removeDataResourceType" short-description="Remove Data Resource Type"> <make-value entity-name="DataResourceType" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -242,14 +242,14 @@ <simple-method method-name="updateDataResourceAttribute" short-description="Update Data Resource Attribute"> <make-value entity-name="DataResourceAttribute" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceAttribute" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceAttribute" 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="removeDataResourceAttribute" short-description="Remove Data Resource Attribute"> <make-value entity-name="DataResourceAttribute" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceAttribute" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceAttribute" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -263,14 +263,14 @@ <simple-method method-name="updateDataResourceTypeAttr" short-description="Update Data Resource Type Attribute"> <make-value entity-name="DataResourceTypeAttr" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceTypeAttr" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceTypeAttr" 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="removeDataResourceTypeAttr" short-description="Remove Data Resource Type Attribute"> <make-value entity-name="DataResourceTypeAttr" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="DataResourceTypeAttr" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="DataResourceTypeAttr" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -285,14 +285,14 @@ <simple-method method-name="updateCharacterSet" short-description="Update Character Set"> <make-value entity-name="CharacterSet" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="CharacterSet" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="CharacterSet" 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="removeCharacterSet" short-description="Remove Character Set"> <make-value entity-name="CharacterSet" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="CharacterSet" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="CharacterSet" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -307,14 +307,14 @@ <simple-method method-name="updateFileExtension" short-description="Update Data Resource Role"> <make-value entity-name="FileExtension" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="FileExtension" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="FileExtension" 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="removeFileExtension" short-description="Remove Data Resource Role"> <make-value entity-name="FileExtension" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="FileExtension" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="FileExtension" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -329,14 +329,14 @@ <simple-method method-name="updateMetaDataPredicate" short-description="Update Data Resource Role"> <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="MetaDataPredicate" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="MetaDataPredicate" 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="removeMetaDataPredicate" short-description="Remove Data Resource Role"> <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="MetaDataPredicate" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="MetaDataPredicate" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -351,14 +351,14 @@ <simple-method method-name="updateMimeType" short-description="Update MimeType"> <make-value entity-name="MimeType" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="MimeType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="MimeType" 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="removeMimeType" short-description="Remove MimeType"> <make-value entity-name="MimeType" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="MimeType" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="MimeType" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -372,14 +372,14 @@ <simple-method method-name="updateMimeTypeHtmlTemplate" short-description="Update MimeTypeHtmlTemplate"> <make-value entity-name="MimeTypeHtmlTemplate" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="MimeTypeHtmlTemplate" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="MimeTypeHtmlTemplate" 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="removeMimeTypeHtmlTemplate" short-description="Remove MimeTypeHtmlTemplate"> <make-value entity-name="MimeTypeHtmlTemplate" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="MimeTypeHtmlTemplate" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="MimeTypeHtmlTemplate" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -396,7 +396,7 @@ <simple-method method-name="updateElectronicText" short-description="Update Electronic Text"> <make-value entity-name="ElectronicText" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ElectronicText" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ElectronicText" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> @@ -406,7 +406,7 @@ <make-value entity-name="ElectronicText" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ElectronicText" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ElectronicText" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -420,14 +420,14 @@ <simple-method method-name="updateImageDataResource" short-description="Update Image Data Resource"> <make-value entity-name="ImageDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ImageDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ImageDataResource" 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="removeImageDataResource" short-description="Remove Image Data Resource"> <make-value entity-name="ImageDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="ImageDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="ImageDataResource" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -441,14 +441,14 @@ <simple-method method-name="updateVideoDataResource" short-description="Update Video Data Resource"> <make-value entity-name="VideoDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="VideoDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="VideoDataResource" 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="removeVideoDataResource" short-description="Remove Video Data Resource"> <make-value entity-name="VideoDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="VideoDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="VideoDataResource" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -462,14 +462,14 @@ <simple-method method-name="updateAudioDataResource" short-description="Update Audio Data Resource"> <make-value entity-name="AudioDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="AudioDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="AudioDataResource" 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="removeAudioDataResource" short-description="Remove Audio Data Resource"> <make-value entity-name="AudioDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="AudioDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="AudioDataResource" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -484,14 +484,14 @@ <simple-method method-name="updateOtherDataResource" short-description="Update Other Data Resource"> <make-value entity-name="OtherDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="OtherDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="OtherDataResource" 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="removeOtherDataResource" short-description="Remove Other Data Resource"> <make-value entity-name="OtherDataResource" value-field="lookupKeyValue"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="OtherDataResource" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="OtherDataResource" map="lookupKeyValue" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=730101&r1=730100&r2=730101&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Tue Dec 30 03:51:58 2008 @@ -73,13 +73,13 @@ </if-compare> <check-errors/> <set field="content.contentId" from-field="parameters.contentId"/> - <find-by-primary-key entity-name="Content" value-field="content" map-name="content"/> + <find-by-primary-key entity-name="Content" value-field="content" map="content"/> <set-nonpk-fields map-name="parameters" value-name="content"/> <log level="always" message="content: ${content}"/> <store-value value-name="content"/> <field-to-request map-name="content" field-name="contentId" request-name="contentId"/> <set field="dataResource.dataResourceId" from-field="parameters.dataResourceId"/> - <find-by-primary-key entity-name="DataResource" value-field="dataResource" map-name="dataResource"/> + <find-by-primary-key entity-name="DataResource" value-field="dataResource" map="dataResource"/> <set-nonpk-fields map-name="parameters" value-name="dataResource"/> <set field="dataResource.objectInfo" from-field="parameters.drObjectInfo"/> <log level="always" message="dataResource: ${dataResource}"/> 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=730101&r1=730100&r2=730101&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 03:51:58 2008 @@ -37,7 +37,7 @@ <simple-method method-name="removeWebSite" short-description="Remove a WebSite"> <make-value value-field="lookupKeyValue" entity-name="WebSite"/> <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/> - <find-by-primary-key entity-name="WebSite" map-name="lookupKeyValue" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSite" map="lookupKeyValue" value-field="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </simple-method> @@ -56,14 +56,14 @@ <simple-method method-name="updateWebSiteContent" short-description="Update WebSite Content"> <make-value value-field="lookupPKMap" entity-name="WebSiteContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSiteContent" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSiteContent" 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="removeWebSiteContent" short-description="Remove WebSite Content"> <make-value value-field="lookupPKMap" entity-name="WebSiteContent"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSiteContent" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSiteContent" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -81,14 +81,14 @@ <simple-method method-name="updateWebSiteContentType" short-description="Update WebSite Content Type"> <make-value value-field="lookupPKMap" entity-name="WebSiteContentType"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSiteContentType" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSiteContentType" 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="removeWebSiteContentType" short-description="Remove WebSite Content Type"> <make-value value-field="lookupPKMap" entity-name="WebSiteContentType"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSiteContentType" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSiteContentType" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> @@ -102,20 +102,20 @@ <simple-method method-name="updateWebSitePathAlias" short-description="Update WebSite Path Alias"> <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSitePathAlias" 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="removeWebSitePathAlias" short-description="Remove WebSite Path Alias"> <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="getWebSitePathAlias" short-description="Returns a WebSite Path Alias"> <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSitePathAlias" map-name="lookupPKMap" value-field="alias" use-cache="true"/> + <find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap" value-field="alias" use-cache="true"/> <field-to-result field-name="alias.pathTo" result-name="pathTo"/> </simple-method> @@ -135,14 +135,14 @@ <simple-method method-name="updateWebSiteRole" short-description="Update WebSite Role"> <make-value value-field="lookupPKMap" entity-name="WebSiteRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSiteRole" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSiteRole" 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="removeWebSiteRole" short-description="Remove WebSite Role"> <make-value value-field="lookupPKMap" entity-name="WebSiteRole"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="WebSiteRole" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WebSiteRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730101&r1=730100&r2=730101&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Dec 30 03:51:58 2008 @@ -75,7 +75,7 @@ </call-map-processor> <if-not-empty field="userLoginContext.userLoginId"> <set from-field="userLoginContext.userLoginId" field="userLoginExistsMap.userLoginId"/> - <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-field="existingUserLogin"/> + <find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/> <if-not-empty field="existingUserLogin"> <string-to-list string="Username in use, please choose another." message-field-name="USERNAME" list-name="error_list"/> </if-not-empty> @@ -381,7 +381,7 @@ <!-- club number --> <if-not-empty field="parameters.REQUIRE_CLUB"> <set from-field="tempMap.partyId" field="personLookup.partyId"/> - <find-by-primary-key map-name="personLookup" value-field="personVo" entity-name="Person"/> + <find-by-primary-key map="personLookup" value-field="personVo" entity-name="Person"/> <if-empty field="parameters.CLUB_NUMBER"> <call-bsh><![CDATA[ clubId = org.ofbiz.party.party.PartyWorker.createClubId(delegator, "999", 13); @@ -409,7 +409,7 @@ <if-not-empty field="emailContext.emailAddress"> <set from-field="parameters.emailProductStoreId" field="storeEmailLookup.productStoreId"/> <set value="PRDS_CUST_REGISTER" field="storeEmailLookup.emailType"/> - <find-by-primary-key map-name="storeEmailLookup" entity-name="ProductStoreEmailSetting" value-field="storeEmail"/> + <find-by-primary-key map="storeEmailLookup" entity-name="ProductStoreEmailSetting" value-field="storeEmail"/> <if-not-empty field="storeEmail.bodyScreenLocation"> <!-- prepare the email context --> <get-related-one value-name="createdUserLogin" relation-name="Person" to-value-name="personObj"/> @@ -473,7 +473,7 @@ <set from-field="tempMap.partyId" field="partyId" /> <if-not-empty field="partyId"> <set field="lookupKeyValue.userLoginId" value="anonymous"/> - <find-by-primary-key map-name="lookupKeyValue" entity-name="UserLogin" value-field="userLogin"/> + <find-by-primary-key map="lookupKeyValue" entity-name="UserLogin" value-field="userLogin"/> <if-not-empty field="userLogin"> <set field="userLogin.partyId" from-field="partyId"/> <field-to-session field-name="userLogin" session-name="userLogin" /> @@ -680,7 +680,7 @@ <!-- the rest of the methods require a userLogin object; so if we are anonymous lets fake it --> <if-empty field="userLogin"> <set field="ulLookup.userLoginId" value="anonymous"/> - <find-by-primary-key entity-name="UserLogin" map-name="ulLookup" value-field="userLogin"/> + <find-by-primary-key entity-name="UserLogin" map="ulLookup" value-field="userLogin"/> <set field="userLogin.partyId" from-field="tempMap.partyId"/> <set-current-user-login value-name="userLogin"/> <else><!-- of an anonymous vistor is coming back, update the party id in the userLogin object --> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=730101&r1=730100&r2=730101&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Tue Dec 30 03:51:58 2008 @@ -63,7 +63,7 @@ </call-map-processor> <if-not-empty field="userLoginContext.userLoginId"> <set field=" userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" /> - <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-field="existingUserLogin"/> + <find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/> <if-not-empty field="existingUserLogin"> <set field="tempErrorMessage" value="Username in use, please choose another." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> @@ -303,7 +303,7 @@ <if-empty field="newUserLogin"> <!-- the rest of the methods require a userLogin object; so if we are anonymous lets fake it --> <set field="ulLookup.userLoginId" value="anonymous"/> - <find-by-primary-key entity-name="UserLogin" map-name="ulLookup" value-field="userLogin"/> + <find-by-primary-key entity-name="UserLogin" map="ulLookup" value-field="userLogin"/> <set field="userLogin.partyId" from-field="partyId"/> <set-current-user-login value-name="userLogin"/> <else> @@ -520,7 +520,7 @@ <set from-field="partyId" field="partyId" /> <if-not-empty field="partyId"> <set field="lookupKeyValue.userLoginId" value="anonymous"/> - <find-by-primary-key map-name="lookupKeyValue" entity-name="UserLogin" value-field="userLogin"/> + <find-by-primary-key map="lookupKeyValue" entity-name="UserLogin" value-field="userLogin"/> <if-not-empty field="userLogin"> <set field="userLogin.partyId" from-field="partyId"/> <field-to-session field-name="userLogin" session-name="userLogin" /> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=730101&r1=730100&r2=730101&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Tue Dec 30 03:51:58 2008 @@ -88,7 +88,7 @@ <if-not-empty field="routingGS"> <clear-field field-name="lookupRouting"/> <set from-field="routingGS.workEffortId" field="lookupRouting.workEffortId"/> - <find-by-primary-key entity-name="WorkEffort" value-field="routing" map-name="lookupRouting"/> + <find-by-primary-key entity-name="WorkEffort" value-field="routing" map="lookupRouting"/> <else> <!-- The default routing is used when no explicit routing is associated to the product and the ignoreDefaultRouting is not equals to Y --> @@ -102,7 +102,7 @@ <then> <clear-field field-name="lookupRouting"/> <set value="DEFAULT_ROUTING" field="lookupRouting.workEffortId"/> - <find-by-primary-key entity-name="WorkEffort" value-field="routing" map-name="lookupRouting"/> + <find-by-primary-key entity-name="WorkEffort" value-field="routing" map="lookupRouting"/> </then> </if> </else> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml?rev=730101&r1=730100&r2=730101&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml Tue Dec 30 03:51:58 2008 @@ -25,7 +25,7 @@ <if-compare field="parameters.copyTask" operator="equals" value="Y"> <make-value value-field="lookupPKMap" entity-name="WorkEffort"/> <set field="lookupPKMap.workEffortId" from-field="parameters.workEffortIdTo"/> - <find-by-primary-key entity-name="WorkEffort" map-name="lookupPKMap" value-field="lookedUpValue"/> + <find-by-primary-key entity-name="WorkEffort" map="lookupPKMap" value-field="lookedUpValue"/> <call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml" processor-name="copyRoutingTask" in-map-name="lookedUpValue" out-map-name="context"/> <call-service service-name="createWorkEffort" in-map-name="context"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |