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 2009/02/06 10:05:26 UTC
svn commit: r741477 - in /ofbiz/trunk/applications:
order/script/org/ofbiz/order/request/ party/script/org/ofbiz/party/contact/
product/script/org/ofbiz/product/category/
product/script/org/ofbiz/product/config/
product/script/org/ofbiz/product/feature...
Author: jleroux
Date: Fri Feb 6 09:05:26 2009
New Revision: 741477
URL: http://svn.apache.org/viewvc?rev=741477&view=rev
Log:
<field-to-result field.*="(.*)" map.*="(.*)"/> => <field-to-result field="$2.$1" result-name="$1"/>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
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=741477&r1=741476&r2=741477&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 Fri Feb 6 09:05:26 2009
@@ -70,7 +70,7 @@
<to-string field="custRequestId"/>
<set from-field="custRequestId" field="newEntity.custRequestId"/>
<create-value value-field="newEntity"/>
- <field-to-result field="custRequestId" map-name="newEntity"/>
+ <field-to-result field="newEntity.custRequestId" result-name="custRequestId"/>
<!-- jacopoc: Commented out the following code because it is too specific and not valid as a
general rule: a user may enter the request from a customer even if he will not work
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=741477&r1=741476&r2=741477&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Fri Feb 6 09:05:26 2009
@@ -61,7 +61,7 @@
</if-empty>
<log level="info" message="Creating a PartyContactMech with id: ${parameters.contactMechId}"/>
<set field="newValue.partyId" from-field="parameters.partyId"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
<field-to-request field="contactMechId" map-name="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<now-timestamp field="newValue.fromDate"/>
@@ -173,7 +173,7 @@
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
</call-service>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="newPartyContactMech.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="updatePartyPostalAddress" short-description="Update a PostalAddress for party">
@@ -196,7 +196,7 @@
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
</call-service>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="newPartyContactMech.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="createPartyTelecomNumber" short-description="Create a TelecomNumber for party">
@@ -220,7 +220,7 @@
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
</call-service>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="newPartyContactMech.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="updatePartyTelecomNumber" short-description="Update a TelecomNumber for party">
@@ -245,7 +245,7 @@
</call-service>
<log level="info" message="Setting result id: ${newPartyContactMech.contactMechId}"/>
<field-to-request field="contactMechId" map-name="newPartyContactMech"/>
- <field-to-result field="contactMechId" map-name="newPartyContactMech"/>
+ <field-to-result field="newPartyContactMech.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="createPartyEmailAddress" short-description="Create an email address for party">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=741477&r1=741476&r2=741477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Fri Feb 6 09:05:26 2009
@@ -782,7 +782,7 @@
</call-service>
<if-compare field="genericResult.hasPermission" operator="equals" value="false" type="Boolean">
<field-to-result field="genericResult.hasPermission" result-name="hasPermission"/>
- <field-to-result field="genericResult.failMessage" map-name="failMessage"/>
+ <field-to-result field="failMessage.genericResult.failMessage" result-name="genericResult.failMessage"/>
<return/>
</if-compare>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=741477&r1=741476&r2=741477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Fri Feb 6 09:05:26 2009
@@ -37,7 +37,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field="fromDate" map-name="newEntity"/>
+ <field-to-result field="newEntity.fromDate" result-name="fromDate"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -80,7 +80,7 @@
<sequenced-id sequence-name="ProductConfigItem" field="newEntity.configItemId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
- <field-to-result field="configItemId" map-name="newEntity"/>
+ <field-to-result field="newEntity.configItemId" result-name="configItemId"/>
</simple-method>
<simple-method method-name="updateProductConfigItem" short-description="Update a Config Item">
<check-permission action="_UPDATE" permission="CATALOG">
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=741477&r1=741476&r2=741477&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 09:05:26 2009
@@ -383,7 +383,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field="fromDate" map-name="newEntity"/>
+ <field-to-result field="newEntity.fromDate" result-name="fromDate"/>
<set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
<set field="newEntity.createdDate" from-field="nowTimestamp" />
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=741477&r1=741476&r2=741477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Fri Feb 6 09:05:26 2009
@@ -37,7 +37,7 @@
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp" />
</if-empty>
- <field-to-result field="fromDate" map-name="newEntity"/>
+ <field-to-result field="newEntity.fromDate" result-name="fromDate"/>
<set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
<set field="newEntity.createdDate" from-field="nowTimestamp" />
@@ -146,7 +146,7 @@
<make-value value-field="newEntity" entity-name="ProductPriceRule"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ProductPriceRule" field="newEntity.productPriceRuleId"/>
- <field-to-result field="productPriceRuleId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPriceRuleId" result-name="productPriceRuleId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -182,7 +182,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
- <field-to-result field="productPriceCondSeqId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPriceCondSeqId" result-name="productPriceCondSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -218,7 +218,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
- <field-to-result field="productPriceActionSeqId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPriceActionSeqId" result-name="productPriceActionSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=741477&r1=741476&r2=741477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Fri Feb 6 09:05:26 2009
@@ -29,7 +29,7 @@
<make-value value-field="newEntity" entity-name="ProductPromo"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="ProductPromo" field="newEntity.productPromoId"/>
- <field-to-result field="productPromoId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPromoId" result-name="productPromoId"/>
<if-empty field="newEntity.userEntered">
<set value="Y" set-if-empty="true" field="newEntity.userEntered"/>
@@ -84,7 +84,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
- <field-to-result field="productPromoActionSeqId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPromoActionSeqId" result-name="productPromoActionSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -157,7 +157,7 @@
<sequenced-id sequence-name="ProductPromoCode" field="newEntity.productPromoCodeId" stagger-max="100"/>
</if-empty>
- <field-to-result field="productPromoCodeId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPromoCodeId" result-name="productPromoCodeId"/>
<now-timestamp field="nowTimestamp"/>
<if-empty field="newEntity.fromDate">
@@ -253,7 +253,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
- <field-to-result field="productPromoCondSeqId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPromoCondSeqId" result-name="productPromoCondSeqId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -323,7 +323,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<make-next-seq-id value-field="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
- <field-to-result field="productPromoRuleId" map-name="newEntity"/>
+ <field-to-result field="newEntity.productPromoRuleId" result-name="productPromoRuleId"/>
<create-value value-field="newEntity"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=741477&r1=741476&r2=741477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Fri Feb 6 09:05:26 2009
@@ -41,7 +41,7 @@
</if-empty>
<log level="info" message="Creating a FacilityContactMech with id: ${parameters.contactMechId}"/>
<set field="newValue.facilityId" from-field="parameters.facilityId" />
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
<field-to-request field="contactMechId" map-name="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<now-timestamp field="newValue.fromDate"/>
@@ -162,7 +162,7 @@
</call-service>
<field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="updateFacilityPostalAddress" short-description="Update a PostalAddress for facility">
@@ -185,7 +185,7 @@
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
<field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="createFacilityTelecomNumber" short-description="Create a TelecomNumber for facility">
@@ -209,7 +209,7 @@
</call-service>
<field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="updateFacilityTelecomNumber" short-description="Update a TelecomNumber for facility">
@@ -234,7 +234,7 @@
</call-service>
<log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
<field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
- <field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-result field="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
</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=741477&r1=741476&r2=741477&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 Fri Feb 6 09:05:26 2009
@@ -332,7 +332,7 @@
</simple-method>
<simple-method method-name="unlinkInvoiceFromTimeEntry" short-description="Delete TimeEntry">
<entity-one entity-name="TimeEntry" value-field="lookedUpValue"/>
- <field-to-result field="invoiceId" map-name="lookedUpValue"/>
+ <field-to-result field="lookedUpValue.invoiceId" result-name="invoiceId"/>
<clear-field field="lookedUpValue.invoiceId"/>
<store-value value-field="lookedUpValue"/>
</simple-method>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=741477&r1=741476&r2=741477&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Fri Feb 6 09:05:26 2009
@@ -341,7 +341,7 @@
<log level="info" message="Creating a WorkEffortContactMech"/>
<set from-field="parameters.workEffortId" field="newValue.workEffortId"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
<field-to-request field="contactMechId" map-name="newValue"/>
<create-value value-field="newValue"/>
</simple-method>
@@ -379,7 +379,7 @@
<remove-value value-field="workEffortContactMech"/>
</if-compare-field>
- <field-to-result field="contactMechId" map-name="newWorkEffortContactMech"/>
+ <field-to-result field="newWorkEffortContactMech.contactMechId" result-name="contactMechId"/>
<field-to-request field="contactMechId" map-name="newWorkEffortContactMech"/>
</simple-method>
@@ -422,7 +422,7 @@
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="updateWorkEffortPostalAddress" short-description="Update a PostalAddress for WorkEffort">
@@ -442,7 +442,7 @@
<default-message>WorkEffort Contact Mechanism successfully updated</default-message>
</call-service>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="createWorkEffortTelecomNumber" short-description="Create a TelecomNumber for WorkEffort">
@@ -473,7 +473,7 @@
<default-message>WorkEffort Contact Mechanism successfully created</default-message>
</call-service>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="updateWorkEffortTelecomNumber" short-description="Update a TelecomNumber for WorkEffort">
@@ -495,7 +495,7 @@
</call-service>
<log level="info" message="Setting result id: ${newValue.contactMechId}"/>
<field-to-request field="contactMechId" map-name="newValue"/>
- <field-to-result field="contactMechId" map-name="newValue"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="createWorkEffortEmailAddress" short-description="Create an email address for WorkEffort">