svn commit: r741594 - in /ofbiz/trunk: applications/manufacturing/scr
Locked
svn commit: r741594 - in /ofbiz/trunk: applications/manufacturing/scr
 
|
Author: jleroux
Date: Fri Feb 6 15:28:41 2009 New Revision: 741594 URL: http://svn.apache.org/viewvc?rev=741594&view=rev Log: Simple-method and alike tags cleanup. Not sure yet, but I guess there are no "Xerces errors" anymore. I will post some other errors (of other types I guess) I found using Artifact Info in dev ML soon Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml Fri Feb 6 15:28:41 2009 @@ -30,7 +30,7 @@ <number value="10"/> </calcop> </calculate> - <field-to-result field-name="totQuantity" result-name="quantity"/> + <field-to-result field="totQuantity" result-name="quantity"/> </simple-method> <simple-method method-name="linearComponentConsumptionFormula" short-description="Formula that the number of linear components in bom"> @@ -69,6 +69,6 @@ </calculate> </else> </if-compare-field> - <field-to-result field-name="quantity" result-name="quantity"/> + <field-to-result field="quantity" result-name="quantity"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml Fri Feb 6 15:28:41 2009 @@ -36,6 +36,6 @@ <number value="10"/> </calcop> </calculate> - <field-to-result field-name="totalTime" result-name="totalTime"/> + <field-to-result field="totalTime" result-name="totalTime"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Fri Feb 6 15:28:41 2009 @@ -110,7 +110,7 @@ <!-- set subject, contentType, templateName, templateData --> <set field="sendEmailMap.subject" value="Delivery Information Updated for Order #${orderDeliverySchedule.orderId}"/> <if-compare field="orderDeliverySchedule.orderItemSeqId" operator="not-equals" value="_NA_"> - <string-append string=" Item #${orderDeliverySchedule.orderItemSeqId}" field="subject" map-name="sendEmailMap"/> + <string-append string=" Item #${orderDeliverySchedule.orderItemSeqId}" field="sendEmailMap.subject"/> </if-compare> <set field="sendEmailMap.contentType" value="text/html"/> <set field="sendEmailMap.templateName" value="default/OrderDeliveryUpdatedNotice.ftl"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml Fri Feb 6 15:28:41 2009 @@ -21,25 +21,25 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="updateAVSOverride" short-description="Create/Update The AVS Override String"> - <make-value value-name="lookupPKMap" entity-name="PartyIcsAvsOverride"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="PartyIcsAvsOverride" map-name="lookupPKMap" value-name="lookedUpValue"/> + <make-value value-field="lookupPKMap" entity-name="PartyIcsAvsOverride"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> + <find-by-primary-key entity-name="PartyIcsAvsOverride" map="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.partyId"> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </if-not-empty> <if-empty field="lookedUpValue.partyId"> - <set-nonpk-fields map-name="parameters" value-name="lookupPKMap"/> - <create-value value-name="lookupPKMap"/> + <set-nonpk-fields map="parameters" value-field="lookupPKMap"/> + <create-value value-field="lookupPKMap"/> </if-empty> </simple-method> <simple-method method-name="deleteAVSOverride" short-description="Delete The AVS Override String"> - <make-value value-name="lookupPKMap" entity-name="PartyIcsAvsOverride"/> - <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> - <find-by-primary-key entity-name="PartyIcsAvsOverride" map-name="lookupPKMap" value-name="lookedUpValue"/> + <make-value value-field="lookupPKMap" entity-name="PartyIcsAvsOverride"/> + <set-pk-fields map="parameters" value-field="lookupPKMap"/> + <find-by-primary-key entity-name="PartyIcsAvsOverride" map="lookupPKMap" value-field="lookedUpValue"/> <if-not-empty field="lookedUpValue.partyId"> - <remove-value value-name="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> </if-not-empty> </simple-method> @@ -65,17 +65,17 @@ <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> </else> </if-empty> - <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="lookedUpValue"/> + <find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="lookedUpValue"/> <if-empty field="lookedUpValue"> - <make-value value-name="newValue" entity-name="PartyRole" map-name="lookupPKMap"/> - <create-value value-name="newValue"/> + <make-value value-field="newValue" entity-name="PartyRole" map="lookupPKMap"/> + <create-value value-field="newValue"/> </if-empty> </simple-method> <simple-method method-name="createPersonAndUserLogin" short-description="Creates a person and userlogin" login-required="false"> - <set-service-fields service-name="createUserLogin" map-name="parameters" to-map-name="createUlInMap"/> + <set-service-fields service-name="createUserLogin" map="parameters" to-map="createUlInMap"/> - <set-service-fields service-name="createPerson" map-name="parameters" to-map-name="createPersonCtx"/> + <set-service-fields service-name="createPerson" map="parameters" to-map="createPersonCtx"/> <call-service service-name="createPerson" in-map-name="createPersonCtx"> <result-to-field result-name="partyId" field="createUlInMap.partyId"/> </call-service> @@ -88,8 +88,8 @@ <call-service service-name="createUserLogin" in-map-name="createUlInMap"/> <entity-one entity-name="UserLogin" value-field="newUserLogin"/> - <field-to-result field-name="newUserLogin"/> - <field-to-result field-name="createUlInMap.partyId" result-name="partyId"/> + <field-to-result field="newUserLogin"/> + <field-to-result field="createUlInMap.partyId" result-name="partyId"/> </simple-method> <!-- Simple method to create a person, its role and basic contact mechs --> @@ -118,7 +118,7 @@ <check-errors/> <call-service service-name="createPerson" in-map-name="personContext"> - <result-to-field result-name="partyId" field-name="partyId"/> + <result-to-field result-name="partyId" field="partyId"/> </call-service> <if-not-empty field="parameters.roleTypeId"> @@ -162,7 +162,7 @@ <set field="partyGroupContext.partyTypeId" value="PARTY_GROUP"/> <call-service service-name="createPartyGroup" in-map-name="partyGroupContext"> - <result-to-field result-name="partyId" field-name="partyId"/> + <result-to-field result-name="partyId" field="partyId"/> </call-service> <if-not-empty field="parameters.roleTypeId"> @@ -190,7 +190,7 @@ </call-service> <if-not-empty field="postalAddContactMechPurpTypeId"> - <set-service-fields service-name="createPartyContactMechPurpose" map-name="postalAddressContext" to-map-name="serviceCtx"/> + <set-service-fields service-name="createPartyContactMechPurpose" map="postalAddressContext" to-map="serviceCtx"/> <set field="serviceCtx.contactMechPurposeTypeId" from-field="postalAddContactMechPurpTypeId"/> <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceCtx"/> </if-not-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Fri Feb 6 15:28:41 2009 @@ -60,7 +60,7 @@ <set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContentMap"/> <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/> <call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap"> - <result-to-field result-name="contentId" map-name="createCategoryContentMap" /> + <result-to-field result-name="contentId" field="createCategoryContentMap.contentId" /> </call-service> <call-service service-name="createCategoryContent" in-map-name="createCategoryContentMap"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Fri Feb 6 15:28:41 2009 @@ -62,7 +62,7 @@ <set-service-fields service-name="createProductConfigItemContent" map="parameters" to-map="createProductConfigItemContent"/> <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleText"/> <call-service service-name="createSimpleTextContent" in-map-name="createSimpleText" break-on-error="true" > - <result-to-field result-name="contentId" map-name="createProductConfigItemContent" /> + <result-to-field result-name="contentId" field="createProductConfigItemContent.contentId" /> </call-service> <call-service service-name="createProductConfigItemContent" in-map-name="createProductConfigItemContent"/> </simple-method> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Fri Feb 6 15:28:41 2009 @@ -283,7 +283,7 @@ <if> <condition> <not> - <if-regexp field-name="parameters.productFeatureTypeId" expr="^[a-zA-Z_0-9]+$"></if-regexp> + <if-regexp field="parameters.productFeatureTypeId" expr="^[a-zA-Z_0-9]+$"></if-regexp> </not> </condition> <then> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Fri Feb 6 15:28:41 2009 @@ -62,7 +62,7 @@ <set-service-fields service-name="createProductContent" map="parameters" to-map="createProductContent"/> <set-service-fields service-name="createEmailContent" map="parameters" to-map="createEmail"/> <call-service service-name="createEmailContent" in-map-name="createEmail" break-on-error="true" > - <result-to-field result-name="contentId" map-name="createProductContent" /> + <result-to-field result-name="contentId" field="createProductContent.contentId" /> </call-service> <call-service service-name="createProductContent" in-map-name="createProductContent"/> </simple-method> @@ -79,7 +79,7 @@ <set field="persistContentAndAssoc.contentTypeId" value="DOCUMENT"/> <set field="persistContentAndAssoc.dataResourceTypeId" value="IMAGE_OBJECT"/> <call-service service-name="persistContentAndAssoc" in-map-name="persistContentAndAssoc" break-on-error="true" > - <result-to-field result-name="contentId" map-name="createProductContent" /> + <result-to-field result-name="contentId" field="createProductContent.contentId" /> </call-service> <call-service service-name="createProductContent" in-map-name="createProductContent"/> </simple-method> Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml (original) +++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml Fri Feb 6 15:28:41 2009 @@ -39,7 +39,7 @@ <log level="info" message="${response}"/> <call-simple-method method-name="getReDirectFromXmlDoc"/> <log level="info" message="step 5 done"/> - <field-to-result field-name="redirect"/> + <field-to-result field="redirect"/> </simple-method> <!-- Step 1 --> <simple-method method-name="connectWithRedirectHack" short-description=""> Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=741594&r1=741593&r2=741594&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Fri Feb 6 15:28:41 2009 @@ -47,7 +47,7 @@ <set value="hhFacility Receipt" field="receiveCtx.comments"/> <set from-field="nowTimestamp" field="receiveCtx.datetimeReceived"/> <set value="NON_SERIAL_INV_ITEM" field="receiveCtx.inventoryItemTypeId"/> - <calculate field="receiveCtx" type="Double.quantityRejected" > + <calculate field="receiveCtx.quantityRejected" type="Double"> <number value="0"/> </calculate> <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |