You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 18:29:34 UTC
svn commit: r730197 [1/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/content/script/org/ofbiz/content/compdoc/
applications/content/script/or...
Author: jleroux
Date: Tue Dec 30 09:29:33 2008
New Revision: 730197
URL: http://svn.apache.org/viewvc?rev=730197&view=rev
Log:
ret-field-name => ret-field
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.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/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.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/CustRequestEvents.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.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/party/PartySimpleEvents.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/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml
ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PromoEvents.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=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Dec 30 09:29:33 2008
@@ -63,7 +63,7 @@
<else>
<!-- first figure out if we need to reset the lastInvoiceNumber; is the lastInvoiceRestartDate after the fiscalYearStartMonth/Day for this year? -->
<calculate field="zeroLong" type="Long"><number value="0"/></calculate>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getYearStart" ret-field-name="curYearFiscalStartDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getYearStart" ret-field="curYearFiscalStartDate">
<field field-name="nowTimestamp" type="java.sql.Timestamp"/>
<field field-name="partyAcctgPreference.fiscalYearStartDay" type="java.lang.Number"/>
<field field-name="partyAcctgPreference.fiscalYearStartMonth" type="java.lang.Number"/>
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=730197&r1=730196&r2=730197&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 09:29:33 2008
@@ -80,7 +80,7 @@
<find-by-and entity-name="CreditCard" map-name="lookupMap" list-name="creditCards"/>
<iterate entry="creditCard" list="creditCards">
- <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDateAfterToday" ret-field-name="isNotExpired">
+ <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDateAfterToday" ret-field="isNotExpired">
<field field-name="creditCard.expireDate"/>
</call-class-method>
<if-compare field="isNotExpired" operator="equals" type="Boolean" value="true">
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=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 09:29:33 2008
@@ -250,10 +250,10 @@
<set field="invoice" from-field="parameters.invoice"/>
</else>
</if-empty>
- <call-class-method class-name="org.ofbiz.accounting.invoice.InvoiceWorker" method-name="getInvoiceTotalBd" ret-field-name="invoiceTotalAmount">
+ <call-class-method class-name="org.ofbiz.accounting.invoice.InvoiceWorker" method-name="getInvoiceTotalBd" ret-field="invoiceTotalAmount">
<field field-name="invoice" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
- <call-class-method class-name="org.ofbiz.accounting.invoice.InvoiceWorker" method-name="getInvoiceAppliedBd" ret-field-name="invoiceTotalAmountPaid">
+ <call-class-method class-name="org.ofbiz.accounting.invoice.InvoiceWorker" method-name="getInvoiceAppliedBd" ret-field="invoiceTotalAmountPaid">
<field field-name="invoice" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
<get-related relation-name="InvoiceTerm" value-field="invoice" list="invoiceTerms"/>
@@ -266,7 +266,7 @@
<set field="invoicePaymentInfo.invoiceId" from-field="invoice.invoiceId"/>
<set field="invoicePaymentInfo.invoiceTermId" from-field="invoiceTerm.invoiceTermId"/>
<set field="invoicePaymentInfo.termTypeId" from-field="invoiceTerm.termTypeId"/>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field-name="invoicePaymentInfo.dueDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="invoicePaymentInfo.dueDate">
<field field-name="invoice.invoiceDate" type="Timestamp"/>
<field field-name="invoiceTerm.termDays" type="Long"/>
</call-class-method>
@@ -321,12 +321,12 @@
<first-from-list list="invoiceTerms" entry="invoiceTerm"/>
<if-not-empty field="invoiceTerm">
<set field="invoicePaymentInfo.termTypeId" from-field="invoiceTerm.termTypeId"/>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field-name="invoicePaymentInfo.dueDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="invoicePaymentInfo.dueDate">
<field field-name="invoice.invoiceDate" type="Timestamp"/>
<field field-name="invoiceTerm.termDays" type="Long"/>
</call-class-method>
<else>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field-name="invoicePaymentInfo.dueDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="invoicePaymentInfo.dueDate">
<field field-name="invoice.invoiceDate" type="Timestamp"/>
</call-class-method>
</else>
@@ -351,7 +351,7 @@
<simple-method method-name="getInvoicePaymentInfoListByDueDateOffset" short-description="Select a list with information on payment due dates and amounts for invoices.">
<now-timestamp field="nowTimestamp"/>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field-name="asOfDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field="asOfDate">
<field field-name="nowTimestamp" type="Timestamp"/>
<field field-name="parameters.daysOffset" type="Long"/>
</call-class-method>
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=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 09:29:33 2008
@@ -420,7 +420,7 @@
<calculate field="numericPadding" type="Integer">
<number value="6"/>
</calculate>
- <call-class-method method-name="padNumberWithLeadingZeros" class-name="org.ofbiz.content.compdoc.CompDocEvents" ret-field-name="paddedSeqId">
+ <call-class-method method-name="padNumberWithLeadingZeros" class-name="org.ofbiz.content.compdoc.CompDocEvents" ret-field="paddedSeqId">
<field field-name="incrementedSeq" type="Long"/>
<field field-name="numericPadding" type="Integer"/>
</call-class-method>
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=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 09:29:33 2008
@@ -978,20 +978,20 @@
</if-compare>
<set field="contentIdFrom" from-field="parameters.contentIdFrom"/>
<set field="pubPtContentId" from-field="parameters.pubPtContentId"/>
- <call-object-method method-name="length" obj-field-name="parameters.textData" ret-field-name="textDataLen"/>
+ <call-object-method method-name="length" obj-field-name="parameters.textData" ret-field="textDataLen"/>
<log level="info" message="textDataLen:${textDataLen}"/>
<property-to-field resource="forum" property="descriptLen" field-name="descriptLen" />
<log level="info" message="descriptLen:${descriptLen}"/>
<set field="dblTextDataLen" from-field="textDataLen" type="Double"/>
<set field="dblDescriptLen" from-field="descriptLen" type="Double"/>
- <call-class-method method-name="min" class-name="java.lang.Math" ret-field-name="subStringLen">
+ <call-class-method method-name="min" class-name="java.lang.Math" ret-field="subStringLen">
<field field-name="dblTextDataLen" type="double"/>
<field field-name="dblDescriptLen" type="double"/>
</call-class-method>
<set field="intSubStringLen" from-field="subStringLen" type="Integer"/>
<log level="info" message="subStringLen:${subStringLen}"/>
<set field="zeroValue" value="0" type="Integer"/>
- <call-object-method method-name="substring" obj-field-name="parameters.textData" ret-field-name="subDescript">
+ <call-object-method method-name="substring" obj-field-name="parameters.textData" ret-field="subDescript">
<field field-name="zeroValue" type="int"/>
<field field-name="intSubStringLen" type="int"/>
</call-object-method>
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=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 09:29:33 2008
@@ -682,7 +682,7 @@
</if>
<check-errors/>
- <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field-name="uploadPath"/>
+ <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field="uploadPath"/>
<log level="info" message="[attachLocalFileToDataResource] - Found Subdir : ${uploadPath}"/>
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
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=730197&r1=730196&r2=730197&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 09:29:33 2008
@@ -175,12 +175,12 @@
<simple-method login-required="true" method-name="createLayoutImage" short-description="Create Layout Image">
<log level="always" message="in createLayoutImage."/>
- <call-class-method class-name="org.ofbiz.content.layout.LayoutWorker" method-name="uploadImageAndParameters" ret-field-name="formInput">
+ <call-class-method class-name="org.ofbiz.content.layout.LayoutWorker" method-name="uploadImageAndParameters" ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="imageData"/>
</call-class-method>
- <call-class-method class-name="org.ofbiz.content.layout.LayoutWorker" method-name="returnByteBuffer" ret-field-name="byteWrap">
+ <call-class-method class-name="org.ofbiz.content.layout.LayoutWorker" method-name="returnByteBuffer" ret-field="byteWrap">
<field field-name="formInput" type="java.util.Map"/>
</call-class-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=730197&r1=730196&r2=730197&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 09:29:33 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="createCustomer" short-description="Create Customer" login-required="false">
- <call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field-name="productStore">
+ <call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field="productStore">
<field field-name="request" type="javax.servlet.ServletRequest"/>
</call-class-method>
@@ -53,11 +53,11 @@
<!-- if username and/or password should be lowercased, do that now -->
<if-compare field="username_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="USERNAME" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/>
</if-compare>
<if-compare field="password_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="PASSWORD" ret-map-name="parameters"/>
- <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="CONFIRM_PASSWORD" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/>
</if-compare>
<!-- Create the UserLogin Record -->
@@ -1043,17 +1043,17 @@
]]>
</call-bsh>
<set field="shippingEstWpr" from-field="parameters.shippingEstWpr"/>
- <call-object-method obj-field-name="shippingEstWpr" method-name="getShippingMethods" ret-field-name="carrierShipmentMethodList"/>
- <call-object-method obj-field-name="shoppingCart" method-name="getShipmentMethodTypeId" ret-field-name="shipmentMethodTypeId"/>
- <call-object-method obj-field-name="shoppingCart" method-name="getCarrierPartyId" ret-field-name="carrierPartyId"/>
- <call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field-name="currency"/>
+ <call-object-method obj-field-name="shippingEstWpr" method-name="getShippingMethods" ret-field="carrierShipmentMethodList"/>
+ <call-object-method obj-field-name="shoppingCart" method-name="getShipmentMethodTypeId" ret-field="shipmentMethodTypeId"/>
+ <call-object-method obj-field-name="shoppingCart" method-name="getCarrierPartyId" ret-field="carrierPartyId"/>
+ <call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field="currency"/>
<if-not-empty field="shipmentMethodTypeId">
<if-not-empty field="carrierPartyId">
<set field="chosenShippingMethod" value="${shipmentMethodTypeId}@${carrierPartyId}"/>
</if-not-empty>
</if-not-empty>
<iterate list="carrierShipmentMethodList" entry="carrierShipmentMethod">
- <call-object-method obj-field-name="shippingEstWpr" method-name="getShippingEstimate" ret-field-name="shippingEst">
+ <call-object-method obj-field-name="shippingEstWpr" method-name="getShippingEstimate" ret-field="shippingEst">
<field field-name="carrierShipmentMethod" type="org.ofbiz.entity.GenericValue"/>
</call-object-method>
<if-empty field="shippingEst">
@@ -1123,7 +1123,7 @@
<call-object-method obj-field-name="shoppingCart" method-name="setProductStoreShipMethId">
<field field-name="productStoreShipMethId"/>
</call-object-method>
- <call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field-name="isoCode"/>
+ <call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field="isoCode"/>
<set field="dispatcher" from-field="parameters.dispatcher" type="Object"/>
<set field="delegator" from-field="parameters.delegator" type="Object"/>
<set field="locale" from-field="parameters.locale" type="Object"/>
@@ -1172,16 +1172,16 @@
</if-empty>
<if-not-empty field="shoppingCart">
<if-empty field="partyId">
- <call-object-method obj-field-name="shoppingCart" method-name="getPartyId" ret-field-name="partyId"/>
+ <call-object-method obj-field-name="shoppingCart" method-name="getPartyId" ret-field="partyId"/>
</if-empty>
<if-empty field="userLogin">
- <call-object-method obj-field-name="shoppingCart" method-name="getUserLogin" ret-field-name="userLogin"/>
+ <call-object-method obj-field-name="shoppingCart" method-name="getUserLogin" ret-field="userLogin"/>
<if-not-empty field="userLogin">
<set-current-user-login value-name="userLogin"/>
</if-not-empty>
</if-empty>
<if-empty field="shipToContactMechId">
- <call-object-method obj-field-name="shoppingCart" method-name="getShippingContactMechId" ret-field-name="shipToContactMechId"/>
+ <call-object-method obj-field-name="shoppingCart" method-name="getShippingContactMechId" ret-field="shipToContactMechId"/>
</if-empty>
</if-not-empty>
<if-not-empty field="partyId">
@@ -1325,7 +1325,7 @@
</simple-method>
<simple-method method-name="updateCustomerProfile" short-description="Update a customer profile">
- <call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field-name="productStore">
+ <call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field="productStore">
<field field-name="request" type="javax.servlet.ServletRequest"/>
</call-class-method>
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=730197&r1=730196&r2=730197&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 09:29:33 2008
@@ -40,11 +40,11 @@
<!-- if username and/or password should be lowercased, do that now -->
<if-compare field="username_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="username" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="username" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="username" obj-map-name="parameters" method-name="toLowerCase" ret-field="username" ret-map-name="parameters"/>
</if-compare>
<if-compare field="password_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="password" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="password" ret-map-name="parameters"/>
- <call-object-method obj-field-name="confirmPassword" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="confirmPassword" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="password" obj-map-name="parameters" method-name="toLowerCase" ret-field="password" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="confirmPassword" obj-map-name="parameters" method-name="toLowerCase" ret-field="confirmPassword" ret-map-name="parameters"/>
</if-compare>
<!-- Create the UserLogin Record -->
@@ -557,7 +557,7 @@
<field-to-session field-name="parameters.billingContactMechId" session-name="billingContactMechId"></field-to-session>
<else>
<if-not-empty field="cart">
- <call-object-method obj-field-name="cart" method-name="getShippingContactMechId" ret-field-name="shippingContactMechId"/>
+ <call-object-method obj-field-name="cart" method-name="getShippingContactMechId" ret-field="shippingContactMechId"/>
</if-not-empty>
<field-to-session field-name="shippingContactMechId" session-name="billingContactMechId"></field-to-session>
</else>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 09:29:33 2008
@@ -604,22 +604,22 @@
<call-service service-name="loadCartFromOrder" in-map-name="loadCartFromOrderInMap">
<result-to-field result-name="shoppingCart" field="cart"/>
</call-service>
- <call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/>
+ <call-object-method obj-field-name="cart" method-name="items" ret-field="items"/>
<iterate list="items" entry="item">
- <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field-name="orderItemSeqId"/>
+ <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field="orderItemSeqId"/>
<if-empty field="orderItemSeqId">
<!-- this is a new (promo) item -->
<!-- a new order item is created -->
<make-value value-field="newOrderItem" entity-name="OrderItem"/>
<set field="newOrderItem.orderId" from-field="parameters.orderId"/>
- <call-object-method obj-field-name="item" method-name="getItemType" ret-field-name="newOrderItem.orderItemTypeId"/>
- <call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field-name="newOrderItem.selectedAmount"/>
- <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field-name="newOrderItem.unitPrice"/>
- <call-object-method obj-field-name="item" method-name="getListPrice" ret-field-name="newOrderItem.unitListPrice"/>
- <call-object-method obj-field-name="item" method-name="getName" ret-field-name="newOrderItem.itemDescription"/>
- <call-object-method obj-field-name="item" method-name="getStatusId" ret-field-name="newOrderItem.statusId"/>
- <call-object-method obj-field-name="item" method-name="getProductId" ret-field-name="newOrderItem.productId"/>
- <call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="newOrderItem.quantity"/>
+ <call-object-method obj-field-name="item" method-name="getItemType" ret-field="newOrderItem.orderItemTypeId"/>
+ <call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field="newOrderItem.selectedAmount"/>
+ <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field="newOrderItem.unitPrice"/>
+ <call-object-method obj-field-name="item" method-name="getListPrice" ret-field="newOrderItem.unitListPrice"/>
+ <call-object-method obj-field-name="item" method-name="getName" ret-field="newOrderItem.itemDescription"/>
+ <call-object-method obj-field-name="item" method-name="getStatusId" ret-field="newOrderItem.statusId"/>
+ <call-object-method obj-field-name="item" method-name="getProductId" ret-field="newOrderItem.productId"/>
+ <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="newOrderItem.quantity"/>
<set field="newOrderItem.isModifiedPrice" value="N"/>
<set field="newOrderItem.isPromo" value="Y"/>
<if-empty field="newOrderItem.statusId">
@@ -633,7 +633,7 @@
</call-object-method>
</if-empty>
</iterate>
- <call-object-method obj-field-name="cart" method-name="makeAllAdjustments" ret-field-name="adjustments"/>
+ <call-object-method obj-field-name="cart" method-name="makeAllAdjustments" ret-field="adjustments"/>
<!-- Accumulate the new promotion total from the recalculated promotion adjustments -->
<set field="newOrderAdjustmentTotal" value="0" type="BigDecimal"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 09:29:33 2008
@@ -308,7 +308,7 @@
</and>
</condition>
<then>
- <call-class-method class-name="org.ofbiz.product.config.ProductConfigWorker" method-name="loadProductConfigWrapper" ret-field-name="configWrapper">
+ <call-class-method class-name="org.ofbiz.product.config.ProductConfigWorker" method-name="loadProductConfigWrapper" ret-field="configWrapper">
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
<field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/>
<field field-name="parameters.configId" type="java.lang.String"/>
@@ -320,7 +320,7 @@
<field field-name="locale" type="java.util.Locale"/>
<field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/>
</call-class-method>
- <call-object-method method-name="getTotalPrice" obj-field-name="configWrapper" ret-field-name="totalPrice"></call-object-method>
+ <call-object-method method-name="getTotalPrice" obj-field-name="configWrapper" ret-field="totalPrice"></call-object-method>
<set field="newEntity.quoteUnitPrice" from-field="totalPrice"/>
</then>
<else>
@@ -599,16 +599,16 @@
<result-to-field result-name="shoppingCart" field="cart"/>
</call-service>
- <call-object-method obj-field-name="cart" method-name="items" ret-field-name="items"/>
+ <call-object-method obj-field-name="cart" method-name="items" ret-field="items"/>
<iterate list="items" entry="item">
- <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field-name="orderItemSeqId"/>
+ <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field="orderItemSeqId"/>
<if-empty field="orderItemSeqId">
<!-- this is a new (promo) item -->
<!-- a new quote item is created -->
<clear-field field="createQuoteItemInMap"/>
<set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="parameters"/>
- <call-object-method obj-field-name="item" method-name="getProductId" ret-field-name="createQuoteItemInMap.productId"/>
- <call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="createQuoteItemInMap.quantity"/>
+ <call-object-method obj-field-name="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/>
+ <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/>
<set value="Y" field="createQuoteItemInMap.isPromo"/>
<call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap">
<result-to-field result-name="quoteItemSeqId" field="quoteItemSeqId"/>
@@ -617,7 +617,7 @@
<call-object-method obj-field-name="item" method-name="setOrderItemSeqId">
<field field-name="quoteItemSeqId" type="String"/>
</call-object-method>
- <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field-name="newOrderItemSeqId"/>
+ <call-object-method obj-field-name="item" method-name="getOrderItemSeqId" ret-field="newOrderItemSeqId"/>
</if-empty>
</iterate>
<!-- set the quoteUnitPrice from the item basePrice -->
@@ -631,19 +631,19 @@
</or>
</condition>
<then>
- <call-object-method obj-field-name="cart" method-name="findCartItem" ret-field-name="item">
+ <call-object-method obj-field-name="cart" method-name="findCartItem" ret-field="item">
<field field-name="quoteItem.quoteItemSeqId" type="String"/>
</call-object-method>
<clear-field field="updateQuoteItemInMap"/>
<set from-field="quoteItem.quoteId" field="updateQuoteItemInMap.quoteId"/>
<set from-field="quoteItem.quoteItemSeqId" field="updateQuoteItemInMap.quoteItemSeqId"/>
- <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field-name="updateQuoteItemInMap.quoteUnitPrice"/>
+ <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field="updateQuoteItemInMap.quoteUnitPrice"/>
<call-service service-name="updateQuoteItem" in-map-name="updateQuoteItemInMap"/>
</then>
</if>
</iterate>
- <call-object-method obj-field-name="cart" method-name="makeAllQuoteAdjustments" ret-field-name="adjustments"/>
+ <call-object-method obj-field-name="cart" method-name="makeAllQuoteAdjustments" ret-field="adjustments"/>
<iterate list="adjustments" entry="adjustment">
<set from-field="parameters.quoteId" field="adjustment.quoteId"/>
@@ -691,7 +691,7 @@
</simple-method>
<simple-method method-name="createQuoteFromCart" short-description="Create a Quote from a Cart">
- <call-object-method obj-field-name="parameters.cart" method-name="getPartyId" ret-field-name="createQuoteInMap.partyId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getPartyId" ret-field="createQuoteInMap.partyId"/>
<if>
<condition>
<and>
@@ -706,9 +706,9 @@
</if>
<check-errors/>
- <call-object-method obj-field-name="parameters.cart" method-name="getCurrency" ret-field-name="createQuoteInMap.currencyUomId"/>
- <call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field-name="createQuoteInMap.productStoreId"/>
- <call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field-name="createQuoteInMap.salesChannelEnumId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getCurrency" ret-field="createQuoteInMap.currencyUomId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field="createQuoteInMap.productStoreId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field="createQuoteInMap.salesChannelEnumId"/>
<set value="PRODUCT_QUOTE" field="createQuoteInMap.quoteTypeId"/>
<set value="QUO_CREATED" field="createQuoteInMap.statusId"/>
<call-service service-name="createQuote" in-map-name="createQuoteInMap">
@@ -717,17 +717,17 @@
<entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
<!-- create, for every cart item, a quote item -->
- <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field="items"/>
<iterate list="items" entry="item">
<!-- a new quote item is created -->
<clear-field field="createQuoteItemInMap"/>
- <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field-name="isPromo"/>
+ <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field="isPromo"/>
<if-compare field="isPromo" value="true" operator="equals" type="Boolean">
<set value="Y" field="createQuoteItemInMap.isPromo"/>
</if-compare>
- <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field-name="configWrapper"/>
+ <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field="configWrapper"/>
<if-not-empty field="configWrapper">
- <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field-name="configId"/>
+ <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field="configId"/>
<set from-field="configId" field="createQuoteItemInMap.configId"/>
</if-not-empty>
<if>
@@ -739,14 +739,14 @@
</condition>
<then>
<set from-field="quote.quoteId" field="createQuoteItemInMap.quoteId"/>
- <call-object-method obj-field-name="item" method-name="getProductId" ret-field-name="createQuoteItemInMap.productId"/>
- <call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="createQuoteItemInMap.quantity"/>
- <call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field-name="createQuoteItemInMap.selectedAmount"/>
- <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field-name="createQuoteItemInMap.quoteUnitPrice"/>
- <call-object-method obj-field-name="item" method-name="getItemComment" ret-field-name="createQuoteItemInMap.comments"/>
- <call-object-method obj-field-name="item" method-name="getReservStart" ret-field-name="createQuoteItemInMap.reservStart"/>
- <call-object-method obj-field-name="item" method-name="getReservLength" ret-field-name="createQuoteItemInMap.reservLength"/>
- <call-object-method obj-field-name="item" method-name="getReservPersons" ret-field-name="createQuoteItemInMap.reservPersons"/>
+ <call-object-method obj-field-name="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/>
+ <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/>
+ <call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field="createQuoteItemInMap.selectedAmount"/>
+ <call-object-method obj-field-name="item" method-name="getBasePrice" ret-field="createQuoteItemInMap.quoteUnitPrice"/>
+ <call-object-method obj-field-name="item" method-name="getItemComment" ret-field="createQuoteItemInMap.comments"/>
+ <call-object-method obj-field-name="item" method-name="getReservStart" ret-field="createQuoteItemInMap.reservStart"/>
+ <call-object-method obj-field-name="item" method-name="getReservLength" ret-field="createQuoteItemInMap.reservLength"/>
+ <call-object-method obj-field-name="item" method-name="getReservPersons" ret-field="createQuoteItemInMap.reservPersons"/>
<call-service service-name="createQuoteItem" in-map-name="createQuoteItemInMap">
<result-to-field result-name="quoteItemSeqId" field="quoteItemSeqId"/>
@@ -764,7 +764,7 @@
<if-compare field="parameters.applyStorePromotions" value="N" operator="not-equals" type="String"/>
</condition>
<then>
- <call-object-method obj-field-name="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field-name="adjustments"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field="adjustments"/>
<iterate list="adjustments" entry="adjustment">
<set from-field="quote.quoteId" field="adjustment.quoteId"/>
<sequenced-id sequence-name="QuoteAdjustment" field="adjustment.quoteAdjustmentId"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml Tue Dec 30 09:29:33 2008
@@ -23,7 +23,7 @@
<simple-method method-name="createCustRequestContent"
short-description="Create Customer Request Content" login-required="false">
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
- method-name="uploadImageAndParameters" ret-field-name="formInput">
+ method-name="uploadImageAndParameters" ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 09:29:33 2008
@@ -291,13 +291,13 @@
</simple-method>
<simple-method method-name="createCustRequestFromCart" short-description="Create a CustRequest from a ShoppingCart">
- <call-object-method obj-field-name="parameters.cart" method-name="getPartyId" ret-field-name="createCustRequestInMap.fromPartyId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getPartyId" ret-field="createCustRequestInMap.fromPartyId"/>
<set value="RF_QUOTE" field="createCustRequestInMap.custRequestTypeId"/>
<set value="CRQ_SUBMITTED" field="createCustRequestInMap.statusId"/>
<set field="createCustRequestInMap.custRequestName" from-field="parameters.custRequestName"/>
- <call-object-method obj-field-name="parameters.cart" method-name="getCurrency" ret-field-name="createCustRequestInMap.maximumAmountUomId"/>
- <call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field-name="createCustRequestInMap.productStoreId"/>
- <call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field-name="createCustRequestInMap.salesChannelEnumId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getCurrency" ret-field="createCustRequestInMap.maximumAmountUomId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field="createCustRequestInMap.productStoreId"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field="createCustRequestInMap.salesChannelEnumId"/>
<call-service service-name="createCustRequest" in-map-name="createCustRequestInMap">
<result-to-field result-name="custRequestId" field="custRequestId"/>
</call-service>
@@ -305,25 +305,25 @@
<entity-one entity-name="CustRequest" value-field="custRequest" auto-field-map="true"/>
<!-- create, for every cart item, a request item -->
- <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field-name="items"/>
+ <call-object-method obj-field-name="parameters.cart" method-name="items" ret-field="items"/>
<iterate list="items" entry="item">
<!-- a new request item is created -->
<clear-field field="createCustRequestItemInMap"/>
- <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field-name="configWrapper"/>
+ <call-object-method obj-field-name="item" method-name="getConfigWrapper" ret-field="configWrapper"/>
<if-not-empty field="configWrapper">
- <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field-name="configId"/>
+ <call-object-method obj-field-name="configWrapper" method-name="getConfigId" ret-field="configId"/>
<set from-field="configId" field="createCustRequestItemInMap.configId"/>
</if-not-empty>
- <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field-name="isPromo"/>
+ <call-object-method obj-field-name="item" method-name="getIsPromo" ret-field="isPromo"/>
<if-compare field="isPromo" value="false" operator="equals" type="Boolean">
<set from-field="custRequest.custRequestId" field="createCustRequestItemInMap.custRequestId"/>
- <call-object-method obj-field-name="item" method-name="getProductId" ret-field-name="createCustRequestItemInMap.productId"/>
- <call-object-method obj-field-name="item" method-name="getQuantity" ret-field-name="createCustRequestItemInMap.quantity"/>
- <!--<call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field-name="createCustRequestItemInMap.selectedAmount"/>-->
- <!--<call-object-method obj-field-name="item" method-name="getItemComment" ret-field-name="createCustRequestItemInMap.comments"/>-->
- <call-object-method obj-field-name="item" method-name="getReservStart" ret-field-name="createCustRequestItemInMap.reservStart"/>
- <call-object-method obj-field-name="item" method-name="getReservLength" ret-field-name="createCustRequestItemInMap.reservLength"/>
- <call-object-method obj-field-name="item" method-name="getReservPersons" ret-field-name="createCustRequestItemInMap.reservPersons"/>
+ <call-object-method obj-field-name="item" method-name="getProductId" ret-field="createCustRequestItemInMap.productId"/>
+ <call-object-method obj-field-name="item" method-name="getQuantity" ret-field="createCustRequestItemInMap.quantity"/>
+ <!--<call-object-method obj-field-name="item" method-name="getSelectedAmount" ret-field="createCustRequestItemInMap.selectedAmount"/>-->
+ <!--<call-object-method obj-field-name="item" method-name="getItemComment" ret-field="createCustRequestItemInMap.comments"/>-->
+ <call-object-method obj-field-name="item" method-name="getReservStart" ret-field="createCustRequestItemInMap.reservStart"/>
+ <call-object-method obj-field-name="item" method-name="getReservLength" ret-field="createCustRequestItemInMap.reservLength"/>
+ <call-object-method obj-field-name="item" method-name="getReservPersons" ret-field="createCustRequestItemInMap.reservPersons"/>
<call-service service-name="createCustRequestItem" in-map-name="createCustRequestItemInMap">
<result-to-field result-name="custRequestItemSeqId" field="custRequestItemSeqId"/>
</call-service>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Tue Dec 30 09:29:33 2008
@@ -40,11 +40,11 @@
<!-- if username and/or password should be lowercased, do that now -->
<if-compare field="username_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="USERNAME" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/>
</if-compare>
<if-compare field="password_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="PASSWORD" ret-map-name="parameters"/>
- <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="CONFIRM_PASSWORD" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/>
</if-compare>
<!-- Create the UserLogin Record -->
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 09:29:33 2008
@@ -306,7 +306,7 @@
</if-not-empty>
</if-empty>
<if-not-empty field="parameters._uploadedFile_fileName">
- <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field-name="uploadPath"/>
+ <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field="uploadPath"/>
<log level="always" message="[createPartyContent] - Found Subdir : ${uploadPath}"/>
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
@@ -396,7 +396,7 @@
<set from-field="content.dataResourceId" field="lookup.dataResourceId"/>
<find-by-primary-key use-cache="true" entity-name="DataResource" value-field="dataResourceMap" map="lookup"/>
<else>
- <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field-name="uploadPath"/>
+ <call-class-method class-name="org.ofbiz.content.data.DataResourceWorker" method-name="getDataResourceContentUploadPath" ret-field="uploadPath"/>
<log level="always" message="[createPartyContent] - Found Subdir : ${uploadPath}"/>
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
@@ -736,8 +736,8 @@
<!-- address match map -->
<simple-method method-name="createAddressMatchMap" short-description="create a AddressMatchMap">
- <call-object-method obj-field-name="mapValue" obj-map-name="parameters" method-name="toUpperCase" ret-field-name="mapValue" ret-map-name="parameters"/>
- <call-object-method obj-field-name="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field-name="mapKey" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="mapValue" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapValue" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field="mapKey" ret-map-name="parameters"/>
<make-value entity-name="AddressMatchMap" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -895,7 +895,7 @@
</simple-method>
<simple-method method-name="getCountryList" short-description="Returns a list of country" login-required="false">
- <call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field-name="geoList">
+ <call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
<iterate list="geoList" entry="countryGeo">
@@ -907,7 +907,7 @@
<simple-method method-name="getAssociatedStateList" short-description="set the state options for selected country" login-required="false">
<set field="countryGeoId" from-field="parameters.countryGeoId"/>
- <call-class-method method-name="getAssociatedStateList" class-name="org.ofbiz.common.CommonWorkers" ret-field-name="geoList">
+ <call-class-method method-name="getAssociatedStateList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList">
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
<field field-name="countryGeoId" type="String"/>
</call-class-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Tue Dec 30 09:29:33 2008
@@ -78,14 +78,14 @@
<simple-method method-name="createPartyContent" short-description="Creates Party Associated Content" login-required="false">
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
- ret-field-name="formInput">
+ ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="returnByteBuffer"
- ret-field-name="byteWrap">
+ ret-field="byteWrap">
<field field-name="formInput" type="java.util.Map"/>
</call-class-method>
@@ -104,14 +104,14 @@
<simple-method method-name="updatePartyContent" short-description="Update Party Associated Content" login-required="false">
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
- ret-field-name="formInput">
+ ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="returnByteBuffer"
- ret-field-name="byteWrap"
+ ret-field="byteWrap"
>
<field field-name="formInput" type="java.util.Map"/>
</call-class-method >
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Tue Dec 30 09:29:33 2008
@@ -85,7 +85,7 @@
-->
<set field="partyId" value="DemoCustomer"/>
<set field="contactMechTypeId" value="EMAIL_ADDRESS"/>
- <call-class-method method-name="findPartyLatestContactMech" class-name="org.ofbiz.party.party.PartyWorker" ret-field-name="partyAndContactMech">
+ <call-class-method method-name="findPartyLatestContactMech" class-name="org.ofbiz.party.party.PartyWorker" ret-field="partyAndContactMech">
<field field-name="partyId" type="java.lang.String"/>
<field field-name="contactMechTypeId" type="java.lang.String"/>
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
@@ -143,7 +143,7 @@
1. If telecom number is changed then a new record is created in ContactMech and TelecomNumber entity else no change.
-->
<set field="partyId" value="DemoCustomer"/>
- <call-class-method method-name="findPartyLatestTelecomNumber" class-name="org.ofbiz.party.party.PartyWorker" ret-field-name="telecomNumber">
+ <call-class-method method-name="findPartyLatestTelecomNumber" class-name="org.ofbiz.party.party.PartyWorker" ret-field="telecomNumber">
<field field-name="partyId" type="java.lang.String"/>
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
@@ -212,7 +212,7 @@
1. If postal address is changed then a new record is created in ContactMech and PostalAddress entity else no change.
-->
<set field="partyId" value="DemoCustomer"/>
- <call-class-method method-name="findPartyLatestPostalAddress" class-name="org.ofbiz.party.party.PartyWorker" ret-field-name="postalAddress">
+ <call-class-method method-name="findPartyLatestPostalAddress" class-name="org.ofbiz.party.party.PartyWorker" ret-field="postalAddress">
<field field-name="partyId" type="java.lang.String"/>
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
@@ -347,7 +347,7 @@
-->
<set field="partyId" value="DemoCustomer"/>
<set field="userLoginId" value="DemoCustomer"/>
- <call-class-method method-name="findPartyLatestUserLogin" class-name="org.ofbiz.party.party.PartyWorker" ret-field-name="partyUserLogin">
+ <call-class-method method-name="findPartyLatestUserLogin" class-name="org.ofbiz.party.party.PartyWorker" ret-field="partyUserLogin">
<field field-name="partyId" type="java.lang.String"/>
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
</call-class-method>
@@ -370,8 +370,8 @@
<field-map field-name="partyId" from-field="partyId"/>
</entity-one>
<!-- get the encrypted password -->
- <call-class-method method-name="getHashType" class-name="org.ofbiz.common.login.LoginServices" ret-field-name="hashType"/>
- <call-class-method method-name="getDigestHash" class-name="org.ofbiz.base.crypto.HashCrypt" ret-field-name="newPasswordHash">
+ <call-class-method method-name="getHashType" class-name="org.ofbiz.common.login.LoginServices" ret-field="hashType"/>
+ <call-class-method method-name="getDigestHash" class-name="org.ofbiz.base.crypto.HashCrypt" ret-field="newPasswordHash">
<field field-name="serviceCtx.newPassword" type="java.lang.String"/>
<field field-name="hashType" type="java.lang.String"/>
</call-class-method>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Dec 30 09:29:33 2008
@@ -71,11 +71,11 @@
<!-- if username and/or password should be lowercased, do that now -->
<if-compare field="username_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="USERNAME" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field="USERNAME" ret-map-name="parameters"/>
</if-compare>
<if-compare field="password_lowercase" operator="equals" value="true">
- <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="PASSWORD" ret-map-name="parameters"/>
- <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="CONFIRM_PASSWORD" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="PASSWORD" ret-map-name="parameters"/>
+ <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field="CONFIRM_PASSWORD" ret-map-name="parameters"/>
</if-compare>
<!-- Create the UserLogin Record -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 09:29:33 2008
@@ -151,7 +151,7 @@
<if-not-empty field="relCategories">
<if-not-empty field="categories">
<iterate list="relCategories" entry="relCategory">
- <call-object-method obj-field-name="categories" method-name="contains" ret-field-name="addInCategories" >
+ <call-object-method obj-field-name="categories" method-name="contains" ret-field="addInCategories" >
<field field-name="relCategory" type="java.lang.Object"/>
</call-object-method>
<if-compare value="false" field="addInCategories" operator="equals" type="Boolean">
@@ -471,13 +471,13 @@
<simple-method method-name="checkImageUrl" short-description="Check for image url exists or not" login-required="false">
<set field="imageUrl" from-field="parameters.imageUrl"/>
- <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field-name="httpFlag" >
+ <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field="httpFlag" >
<string value="http"></string>
</call-object-method>
- <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field-name="httpsFlag" >
+ <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field="httpsFlag" >
<string value="https"></string>
</call-object-method>
- <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field-name="ftpFlag" >
+ <call-object-method obj-field-name="imageUrl" method-name="startsWith" ret-field="ftpFlag" >
<string value="ftp"></string>
</call-object-method>
<if>
@@ -489,13 +489,13 @@
</or>
</condition>
<then>
- <call-class-method method-name="fromUrlString" class-name="org.ofbiz.base.util.UtilURL" ret-field-name="url">
+ <call-class-method method-name="fromUrlString" class-name="org.ofbiz.base.util.UtilURL" ret-field="url">
<string value="${imageUrl}"/>
</call-class-method>
</then>
<else>
<set field="imageUrl" value="/framework/images/webapp${parameters.imageUrl}" />
- <call-class-method method-name="fromOfbizHomePath" class-name="org.ofbiz.base.util.UtilURL" ret-field-name="url">
+ <call-class-method method-name="fromOfbizHomePath" class-name="org.ofbiz.base.util.UtilURL" ret-field="url">
<string value="${imageUrl}"/>
</call-class-method>
</else>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 09:29:33 2008
@@ -833,7 +833,7 @@
</if-compare>
</iterate-map>
<if-not-empty field="noLongerOnBackOrderIdMap">
- <call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field-name="noLongerOnBackOrderIdSet"/>
+ <call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field="noLongerOnBackOrderIdSet"/>
<field-to-result field="noLongerOnBackOrderIdSet"/>
</if-not-empty>
</simple-method>
@@ -944,7 +944,7 @@
</if-compare>
</iterate-map>
<if-not-empty field="noLongerOnBackOrderIdMap">
- <call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field-name="noLongerOnBackOrderIdSet"/>
+ <call-object-method obj-field-name="noLongerOnBackOrderIdMap" method-name="keySet" ret-field="noLongerOnBackOrderIdSet"/>
<field-to-result field="noLongerOnBackOrderIdSet"/>
</if-not-empty>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 09:29:33 2008
@@ -415,7 +415,7 @@
<!-- do the same for the virtual product... -->
<entity-one entity-name="Product" value-field="product" use-cache="true"/>
- <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field-name="virtualProductId">
+ <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field="virtualProductId">
<field field-name="product" type="GenericValue"/>
</call-class-method>
<if-not-empty field="virtualProductId">
@@ -443,7 +443,7 @@
<!-- do the same for the virtual product... -->
<entity-one entity-name="Product" value-field="product" use-cache="true"/>
- <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field-name="virtualProductId">
+ <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field="virtualProductId">
<field field-name="product" type="GenericValue"/>
</call-class-method>
<if-not-empty field="virtualProductId">
@@ -576,7 +576,7 @@
</simple-method>
<simple-method method-name="updateProductWithReviewRatingAvg" short-description="Update Product with new Review Rating Avg">
<!-- this method is meant to be called in-line and depends in a productId parameter -->
- <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getAverageProductRating" ret-field-name="averageCustomerRating">
+ <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getAverageProductRating" ret-field="averageCustomerRating">
<field field-name="delegator" type="org.ofbiz.entity.GenericDelegator"/>
<field field-name="productId" type="java.lang.String"/>
</call-class-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 09:29:33 2008
@@ -303,7 +303,7 @@
</if-empty>
<!-- make sure the keyword is lower cased -->
- <call-object-method obj-field-name="newEntity.keyword" method-name="toLowerCase" ret-field-name="newEntity.keyword"/>
+ <call-object-method obj-field-name="newEntity.keyword" method-name="toLowerCase" ret-field="newEntity.keyword"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 09:29:33 2008
@@ -54,10 +54,10 @@
<set field="nowTimestamp" from-field="parameters.requiredDate"/>
</else>
</if-empty>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getWeekStart" ret-field-name="parameters.fromDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getWeekStart" ret-field="parameters.fromDate">
<field field-name="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getWeekEnd" ret-field-name="parameters.thruDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getWeekEnd" ret-field="parameters.thruDate">
<field field-name="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
<!-- check if timesheet already exists -->
@@ -304,7 +304,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.fromDate">
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field-name="newEntity.fromDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field="newEntity.fromDate">
<field field-name="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
</if-empty>
Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original)
+++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Tue Dec 30 09:29:33 2008
@@ -66,16 +66,16 @@
</simple-method>
<simple-method method-name="setupItems" short-description="">
<!-- Get Items from Cart -->
- <call-object-method method-name="items" obj-field-name="cart" ret-field-name="cartItems"/>
+ <call-object-method method-name="items" obj-field-name="cart" ret-field="cartItems"/>
<iterate entry="item" list="cartItems">
<!-- itemName -->
- <call-object-method method-name="getProductId" obj-field-name="item" ret-field-name="itemName" ret-map-name="thisItem"/>
+ <call-object-method method-name="getProductId" obj-field-name="item" ret-field="itemName" ret-map-name="thisItem"/>
<!-- itemDesc -->
- <call-object-method method-name="getName" obj-field-name="item" ret-field-name="description" ret-map-name="thisItem"/>
+ <call-object-method method-name="getName" obj-field-name="item" ret-field="description" ret-map-name="thisItem"/>
<!-- unitPrice -->
- <call-object-method method-name="getBasePrice" obj-field-name="item" ret-field-name="unitPrice" ret-map-name="thisItem"/>
+ <call-object-method method-name="getBasePrice" obj-field-name="item" ret-field="unitPrice" ret-map-name="thisItem"/>
<!-- quantity -->
- <call-object-method method-name="getQuantity" obj-field-name="item" ret-field-name="quantity" ret-map-name="thisItem"/>
+ <call-object-method method-name="getQuantity" obj-field-name="item" ret-field="quantity" ret-map-name="thisItem"/>
<!-- merchantItemId -->
<call-simple-method method-name="getMerchantItemId"/>
<!-- merchant private item data -->
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 09:29:33 2008
@@ -180,7 +180,7 @@
<!-- Call layout to get field -->
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
- ret-field-name="formInput">
+ ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="uploadedFile"/>
</call-class-method>
@@ -262,7 +262,7 @@
<!-- Call layout to get field -->
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
- ret-field-name="formInput">
+ ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="partyId"/>
</call-class-method>
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 09:29:33 2008
@@ -188,7 +188,7 @@
short-description="Upload Content and Create Communication Content Association">
<!-- Call layout to get field -->
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
- method-name="uploadImageAndParameters" ret-field-name="formInput">
+ method-name="uploadImageAndParameters" ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="uploadedFile"/>
</call-class-method>
@@ -280,7 +280,7 @@
short-description="Add content to email communication">
<!-- Call layout to get field -->
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
- method-name="uploadImageAndParameters" ret-field-name="formInput">
+ method-name="uploadImageAndParameters" ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="partyId"/>
</call-class-method>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 09:29:33 2008
@@ -316,7 +316,7 @@
<calcop operator="multiply" field="taskDays"/>
<number value="-1"/>
</calculate>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="addDaysToTimestamp" ret-field-name="startDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="addDaysToTimestamp" ret-field="startDate">
<field field-name="startDate"/>
<field field-name="taskDays"/>
</call-class-method>
@@ -351,7 +351,7 @@
<!-- no predecessors so i can set the dates -->
<now-timestamp field="upd.estimatedStartDate"/>
<now-timestamp field="currentDate"/>
- <call-class-method class-name="org.ofbiz.project.Various" method-name="calculateCompletionDate" ret-field-name="upd.estimatedCompletionDate">
+ <call-class-method class-name="org.ofbiz.project.Various" method-name="calculateCompletionDate" ret-field="upd.estimatedCompletionDate">
<field field-name="task" type="org.ofbiz.entity.GenericValue"/>
<field field-name="currentDate" type="java.sql.Timestamp"/>
</call-class-method>
@@ -421,7 +421,7 @@
<remove-value value-field="timeEntry"/>
<else>
<!-- translate the date into the daynumber -->
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getIntervalInDays" ret-field-name="dayNumber">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getIntervalInDays" ret-field="dayNumber">
<field field-name="timesheet.fromDate" type="java.sql.Timestamp"/>
<field field-name="timeEntry.fromDate" type="java.sql.Timestamp"/>
</call-class-method>
@@ -446,7 +446,7 @@
<if-not-empty field="parameters.hoursDay${dayNr}">
<if-compare field="parameters.hoursDay${dayNr}" value="-999999" operator="not-equals">
<set field="hours" from-field="parameters.hoursDay${dayNr}"/>
- <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="addDaysToTimestamp" ret-field-name="fromDate">
+ <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="addDaysToTimestamp" ret-field="fromDate">
<field field-name="timesheet.fromDate" type="java.sql.Timestamp"/>
<field field-name="dayNr" type="int"/>
</call-class-method>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730197&r1=730196&r2=730197&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 09:29:33 2008
@@ -104,7 +104,7 @@
<simple-method method-name="createWorkEffortContent" short-description="Creates Party Associated Content" login-required="false">
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
- ret-field-name="formInput">
+ ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>
@@ -150,7 +150,7 @@
<simple-method method-name="updateWorkEffortContent" short-description="Update Party Associated Content" login-required="false">
<call-class-method class-name="org.ofbiz.content.layout.LayoutWorker"
method-name="uploadImageAndParameters"
- ret-field-name="formInput">
+ ret-field="formInput">
<field field-name="request" type="javax.servlet.http.HttpServletRequest"/>
<string value="dataResourceName"/>
</call-class-method>