|
Author: jleroux
Date: Tue Dec 30 09:30:52 2008 New Revision: 730198 URL: http://svn.apache.org/viewvc?rev=730198&view=rev Log: <field field-name => <field 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/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/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/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/shipment/test/TestServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -64,10 +64,10 @@ <!-- 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="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"/> - <field field-name="zeroLong" type="java.lang.Number"/> + <field field="nowTimestamp" type="java.sql.Timestamp"/> + <field field="partyAcctgPreference.fiscalYearStartDay" type="java.lang.Number"/> + <field field="partyAcctgPreference.fiscalYearStartMonth" type="java.lang.Number"/> + <field field="zeroLong" type="java.lang.Number"/> </call-class-method> <if> <condition> 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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -81,7 +81,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="isNotExpired"> - <field field-name="creditCard.expireDate"/> + <field field="creditCard.expireDate"/> </call-class-method> <if-compare field="isNotExpired" operator="equals" type="Boolean" value="true"> <set-service-fields service-name="updateCreditCard" map="creditCard" to-map="uccMap"/> 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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -251,10 +251,10 @@ </else> </if-empty> <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"/> + <field field="invoice" type="org.ofbiz.entity.GenericValue"/> </call-class-method> <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"/> + <field field="invoice" type="org.ofbiz.entity.GenericValue"/> </call-class-method> <get-related relation-name="InvoiceTerm" value-field="invoice" list="invoiceTerms"/> <set field="remainingAppliedAmount" from-field="invoiceTotalAmountPaid" type="BigDecimal"/> @@ -267,8 +267,8 @@ <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="invoicePaymentInfo.dueDate"> - <field field-name="invoice.invoiceDate" type="Timestamp"/> - <field field-name="invoiceTerm.termDays" type="Long"/> + <field field="invoice.invoiceDate" type="Timestamp"/> + <field field="invoiceTerm.termDays" type="Long"/> </call-class-method> <calculate field="invoiceTermAmount" type="BigDecimal"> <calcop field="invoiceTotalAmount" operator="multiply"> @@ -322,12 +322,12 @@ <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="invoicePaymentInfo.dueDate"> - <field field-name="invoice.invoiceDate" type="Timestamp"/> - <field field-name="invoiceTerm.termDays" type="Long"/> + <field field="invoice.invoiceDate" type="Timestamp"/> + <field field="invoiceTerm.termDays" type="Long"/> </call-class-method> <else> <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="invoice.invoiceDate" type="Timestamp"/> </call-class-method> </else> </if-not-empty> @@ -352,8 +352,8 @@ <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="asOfDate"> - <field field-name="nowTimestamp" type="Timestamp"/> - <field field-name="parameters.daysOffset" type="Long"/> + <field field="nowTimestamp" type="Timestamp"/> + <field field="parameters.daysOffset" type="Long"/> </call-class-method> <entity-condition entity-name="Invoice" list="invoices"> <condition-list combine="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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -421,8 +421,8 @@ <number value="6"/> </calculate> <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"/> + <field field="incrementedSeq" type="Long"/> + <field field="numericPadding" type="Integer"/> </call-class-method> <log level="info" message="incrementedSeq(1): ${incrementedSeq}"/> <log level="info" message="numericPadding(1): ${numericPadding}"/> 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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -985,15 +985,15 @@ <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="subStringLen"> - <field field-name="dblTextDataLen" type="double"/> - <field field-name="dblDescriptLen" type="double"/> + <field field="dblTextDataLen" type="double"/> + <field field="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="subDescript"> - <field field-name="zeroValue" type="int"/> - <field field-name="intSubStringLen" type="int"/> + <field field="zeroValue" type="int"/> + <field field="intSubStringLen" type="int"/> </call-object-method> <log level="info" message="subDescript:${subDescript}"/> <if-compare operator="equals" field="contentAssocTypeId" value="PUBLISH_LINK"> 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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -141,8 +141,8 @@ <log level="always" message="contentId: ${contentId}"/> <log level="always" message="dataResourceId: ${dataResourceId}"/> <call-class-method class-name="org.ofbiz.content.ContentManagementWorker" method-name="mruAdd"> - <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> - <field field-name="subContent" type="org.ofbiz.entity.GenericEntity"/> + <field field="request" type="javax.servlet.http.HttpServletRequest"/> + <field field="subContent" type="org.ofbiz.entity.GenericEntity"/> </call-class-method> --> </simple-method> @@ -176,12 +176,12 @@ <log level="always" message="in createLayoutImage."/> <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"/> + <field field="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="byteWrap"> - <field field-name="formInput" type="java.util.Map"/> + <field field="formInput" type="java.util.Map"/> </call-class-method> <clear-field map-name="formInput" field="imageData"/> @@ -237,8 +237,8 @@ <log level="always" message="contentId: ${contentId}"/> <log level="always" message="dataResourceId: ${dataResourceId}"/> <call-class-method class-name="org.ofbiz.content.ContentManagementWorker" method-name="mruAdd"> - <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> - <field field-name="subContent" type="org.ofbiz.entity.GenericEntity"/> + <field field="request" type="javax.servlet.http.HttpServletRequest"/> + <field field="subContent" type="org.ofbiz.entity.GenericEntity"/> </call-class-method> --> </simple-method> @@ -295,8 +295,8 @@ <log level="always" message="contentId: ${contentId}"/> <log level="always" message="dataResourceId: ${dataResourceId}"/> <call-class-method class-name="org.ofbiz.content.ContentManagementWorker" method-name="mruAdd"> - <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> - <field field-name="subContent" type="org.ofbiz.entity.GenericEntity"/> + <field field="request" type="javax.servlet.http.HttpServletRequest"/> + <field field="subContent" type="org.ofbiz.entity.GenericEntity"/> </call-class-method> --> </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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -23,7 +23,7 @@ <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="productStore"> - <field field-name="request" type="javax.servlet.ServletRequest"/> + <field field="request" type="javax.servlet.ServletRequest"/> </call-class-method> <set from-field="productStore.allowPassword" field="allowPassword"/> @@ -479,7 +479,7 @@ <field-to-session field-name="userLogin" session-name="userLogin" /> <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="setOrderPartyId"> - <field field-name="partyId"/> + <field field="partyId"/> </call-object-method> <call-bsh><![CDATA[ // clear out the login fields from the cart @@ -490,8 +490,8 @@ } ]]></call-bsh> <!-- call-object-method obj-field-name="cart" method-name="setUserLogin"> - <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/> - <field field-name="dispatcher" map-name="request" type="org.ofbiz.service.LocalDispatcher"/> + <field field="userLogin" type="org.ofbiz.entity.GenericValue"/> + <field field="dispatcher" map-name="request" type="org.ofbiz.service.LocalDispatcher"/> </call-object-method --> </if-not-empty> </if-not-empty> @@ -784,10 +784,10 @@ <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="addContactMech"> <string value="SHIPPING_LOCATION"/> - <field field-name="addressContext.contactMechId"/> + <field field="addressContext.contactMechId"/> </call-object-method> <call-object-method obj-field-name="cart" method-name="setShippingContactMechId"> - <field field-name="addressContext.contactMechId"/> + <field field="addressContext.contactMechId"/> </call-object-method> </if-not-empty> </simple-method> @@ -804,46 +804,46 @@ <if-not-empty field="cart"> <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" /> <call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId"> - <field field-name="shipmentMethodTypeId"/> + <field field="shipmentMethodTypeId"/> </call-object-method> <set field="carrierPartyId" from-field="parameters.carrierPartyId" /> <call-object-method obj-field-name="cart" method-name="setCarrierPartyId"> - <field field-name="carrierPartyId"/> + <field field="carrierPartyId"/> </call-object-method> <set field="maySplit" from-field="parameters.may_split" type="Boolean"/> <if-not-empty field="maySplit"> <call-object-method obj-field-name="cart" method-name="setMaySplit"> - <field field-name="maySplit" type="Boolean"/> + <field field="maySplit" type="Boolean"/> </call-object-method> </if-not-empty> <set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/> <if-not-empty field="shippingInstruction"> <call-object-method obj-field-name="cart" method-name="setShippingInstructions"> - <field field-name="shippingInstruction" type="String"/> + <field field="shippingInstruction" type="String"/> </call-object-method> </if-not-empty> <set field="correspondingPoId" from-field="parameters.correspondingPoId"/> <if-not-empty field="correspondingPoId"> <call-object-method obj-field-name="cart" method-name="setPoNumber"> - <field field-name="correspondingPoId" type="String"/> + <field field="correspondingPoId" type="String"/> </call-object-method> </if-not-empty> <set field="isGift" from-field="parameters.is_gift" type="Boolean"/> <if-not-empty field="isGift"> <call-object-method obj-field-name="cart" method-name="setIsGift"> - <field field-name="isGift" type="Boolean"/> + <field field="isGift" type="Boolean"/> </call-object-method> </if-not-empty> <set field="giftMessage" from-field="parameters.gift_message" type="String"/> <if-not-empty field="giftMessage"> <call-object-method obj-field-name="cart" method-name="setGiftMessage"> - <field field-name="giftMessage" type="String"/> + <field field="giftMessage" type="String"/> </call-object-method> </if-not-empty> </if-not-empty> @@ -930,19 +930,19 @@ <!-- Set partyId, in shoppingCart --> <call-object-method obj-field-name="shoppingCart" method-name="setUserLogin"> - <field field-name="userLogin" type="org.ofbiz.entity.GenericValue"/> - <field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/> + <field field="userLogin" type="org.ofbiz.entity.GenericValue"/> + <field field="dispatcher" type="org.ofbiz.service.LocalDispatcher"/> </call-object-method> <call-object-method obj-field-name="shoppingCart" method-name="addContactMech"> <string value="SHIPPING_LOCATION"/> - <field field-name="parameters.shipToContactMechId"/> + <field field="parameters.shipToContactMechId"/> </call-object-method> <call-object-method obj-field-name="shoppingCart" method-name="setShippingContactMechId"> - <field field-name="parameters.shipToContactMechId"/> + <field field="parameters.shipToContactMechId"/> </call-object-method> <log level="info" message="updated shopping cart shipToContactMechId ${parameters.shipToContactMechId}"/> <call-object-method obj-field-name="shoppingCart" method-name="setOrderPartyId"> - <field field-name="partyId"/> + <field field="partyId"/> </call-object-method> </simple-method> @@ -1054,7 +1054,7 @@ </if-not-empty> <iterate list="carrierShipmentMethodList" entry="carrierShipmentMethod"> <call-object-method obj-field-name="shippingEstWpr" method-name="getShippingEstimate" ret-field="shippingEst"> - <field field-name="carrierShipmentMethod" type="org.ofbiz.entity.GenericValue"/> + <field field="carrierShipmentMethod" type="org.ofbiz.entity.GenericValue"/> </call-object-method> <if-empty field="shippingEst"> <set field="shippingEst" value="-1" type="Integer"/> @@ -1115,13 +1115,13 @@ <session-to-field field-name="shoppingCart"/> </if-empty> <call-object-method obj-field-name="shoppingCart" method-name="setShipmentMethodTypeId"> - <field field-name="shipmentMethodTypeId"/> + <field field="shipmentMethodTypeId"/> </call-object-method> <call-object-method obj-field-name="shoppingCart" method-name="setCarrierPartyId"> - <field field-name="carrierPartyId"/> + <field field="carrierPartyId"/> </call-object-method> <call-object-method obj-field-name="shoppingCart" method-name="setProductStoreShipMethId"> - <field field-name="productStoreShipMethId"/> + <field field="productStoreShipMethId"/> </call-object-method> <call-object-method obj-field-name="shoppingCart" method-name="getCurrency" ret-field="isoCode"/> <set field="dispatcher" from-field="parameters.dispatcher" type="Object"/> @@ -1326,7 +1326,7 @@ <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="productStore"> - <field field-name="request" type="javax.servlet.ServletRequest"/> + <field field="request" type="javax.servlet.ServletRequest"/> </call-class-method> <set-service-fields service-name="createUpdatePerson" map="parameters" to-map="createUpdatePersonCtx"/> 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=730198&r1=730197&r2=730198&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:30:52 2008 @@ -526,7 +526,7 @@ <field-to-session field-name="userLogin" session-name="userLogin" /> <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="setOrderPartyId"> - <field field-name="partyId"/> + <field field="partyId"/> </call-object-method> <call-bsh><