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/03 19:18:50 UTC
svn commit: r740368 - in /ofbiz/trunk:
applications/party/script/org/ofbiz/party/contact/
applications/product/script/org/ofbiz/product/category/
applications/product/script/org/ofbiz/product/config/
applications/product/script/org/ofbiz/product/produc...
Author: jleroux
Date: Tue Feb 3 18:18:49 2009
New Revision: 740368
URL: http://svn.apache.org/viewvc?rev=740368&view=rev
Log:
<field-to-result map-name="(.*)" field="(.*)"/> => <field-to-result field="$1.$2"/>
<field-to-request map-name="(.*)" field="(.*)"/> => <field-to-request field="$1.$2"/>
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.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/product/ProductContentServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=740368&r1=740367&r2=740368&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Feb 3 18:18:49 2009
@@ -30,8 +30,8 @@
</if-empty>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<create-value value-field="newValue"/>
- <field-to-result map-name="newValue" field="contactMechId"/>
- <field-to-request map-name="newValue" field-name="contactMechId"/>
+ <field-to-result field="newValue.contactMechId"/>
+ <field-to-request field="newValue.contactMechId"/>
<log level="info" message="Contact mech created with id ${newValue.contactMechId}"/>
</simple-method>
@@ -74,12 +74,12 @@
<default-message resource="PartyUiLabels" property="${successMessageProperty}"/>
<result-to-field result-name="contactMechId" field="newValue"/>
</call-service>
- <field-to-result map-name="newValue" field="contactMechId"/>
- <field-to-request map-name="newValue" field-name="contactMechId"/>
+ <field-to-result field="newValue.contactMechId"/>
+ <field-to-request field="newValue.contactMechId"/>
<else>
<log level="info" message="Contact mech not changed"/>
- <field-to-result map-name="oldValue" field="contactMechId"/>
- <field-to-request map-name="oldValue" field-name="contactMechId"/>
+ <field-to-result field="oldValue.contactMechId"/>
+ <field-to-request field="oldValue.contactMechId"/>
</else>
</if-compare-field>
</simple-method>
@@ -108,8 +108,8 @@
</call-service>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<create-value value-field="newValue"/>
- <field-to-result map-name="newValue" field="contactMechId"/>
- <field-to-request map-name="newValue" field-name="contactMechId"/>
+ <field-to-result field="newValue.contactMechId"/>
+ <field-to-request field="newValue.contactMechId"/>
</simple-method>
<simple-method method-name="updatePostalAddress" short-description="Update Contact Mechanism with PostalAddress">
@@ -157,9 +157,9 @@
</if-compare-field>
</else>
</if-compare-field>
- <field-to-request map-name="newValue" field-name="contactMechId" request-name="contactMechId"/>
- <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/>
- <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/>
+ <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>
+ <field-to-result field="parameters.contactMechId" result-name="oldContactMechId"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
</simple-method>
<simple-method method-name="createTelecomNumber" short-description="Create Contact Mechanism with Telecom Number">
@@ -171,8 +171,8 @@
</call-service>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<create-value value-field="newValue"/>
- <field-to-result map-name="newValue" field="contactMechId"/>
- <field-to-request map-name="newValue" field-name="contactMechId"/>
+ <field-to-result field="newValue.contactMechId"/>
+ <field-to-request field="newValue.contactMechId"/>
</simple-method>
<simple-method method-name="updateTelecomNumber" short-description="Update Contact Mechanism with Telecom Number">
@@ -204,8 +204,8 @@
</if-compare-field>
</else>
</if-compare-field>
- <field-to-result map-name="newValue" field="contactMechId" result-name="contactMechId"/>
- <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/>
+ <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
+ <field-to-result field="parameters.contactMechId" result-name="oldContactMechId"/>
</simple-method>
<simple-method method-name="createEmailAddress" short-description="Create an email address contact mechanism">
@@ -287,7 +287,7 @@
<set field="emailParams.contentType" from-field="storeEmail.contentType"/>
<set field="emailParams.bodyParameters" from-field="bodyParameters"/>
<set field="emailParams.bodyScreenUri" from-field="storeEmail.bodyScreenLocation"/>
- <map-to-map to-map-name="emailParams.bodyParameters" map-name="bodyParameters"/>
+ <map-to-map to-map="emailParams.bodyParameters" map="bodyParameters"/>
<set field="emailParams.webSiteId" from-field="webSite.webSiteId"/>
<call-service service-name="sendMailFromScreen" in-map-name="emailParams"/>
</if-not-empty>
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=740368&r1=740367&r2=740368&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 Tue Feb 3 18:18:49 2009
@@ -286,7 +286,7 @@
<result-to-result result-name="contactMechId"/>
<result-to-request result-name="contactMechId"/>
</call-service>
- <field-to-result map-name="parameters" field="contactMechId" result-name="oldContactMechId"/>
+ <field-to-result field="parameters.contactMechId" result-name="oldContactMechId"/>
</simple-method>
<simple-method method-name="findPartyFromEmailAddress" short-description="Find partyId from email address">
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=740368&r1=740367&r2=740368&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 Tue Feb 3 18:18:49 2009
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field="contentId"/>
- <field-to-result map-name="newEntity" field="productCategoryId"/>
- <field-to-result map-name="newEntity" field="prodCatContentTypeId"/>
+ <field-to-result field="newEntity.contentId"/>
+ <field-to-result field="newEntity.productCategoryId"/>
+ <field-to-result field="newEntity.prodCatContentTypeId"/>
</simple-method>
<simple-method method-name="updateCategoryContent" short-description="Update Content For Category">
<make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
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=740368&r1=740367&r2=740368&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 Tue Feb 3 18:18:49 2009
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field="contentId"/>
- <field-to-result map-name="newEntity" field="configItemId"/>
- <field-to-result map-name="newEntity" field="confItemContentTypeId"/>
+ <field-to-result field="newEntity.contentId"/>
+ <field-to-result field="newEntity.configItemId"/>
+ <field-to-result field="newEntity.confItemContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem">
<make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/>
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=740368&r1=740367&r2=740368&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 Tue Feb 3 18:18:49 2009
@@ -36,9 +36,9 @@
<set-service-fields service-name="updateContent" map="parameters" to-map="updateContent"/>
<call-service service-name="updateContent" in-map-name="updateContent"/>
- <field-to-result map-name="newEntity" field="contentId"/>
- <field-to-result map-name="newEntity" field="productId"/>
- <field-to-result map-name="newEntity" field="productContentTypeId"/>
+ <field-to-result field="newEntity.contentId"/>
+ <field-to-result field="newEntity.productId"/>
+ <field-to-result field="newEntity.productContentTypeId"/>
</simple-method>
<simple-method method-name="updateProductContent" short-description="Update Content For Product">
<make-value value-field="lookupPKMap" entity-name="ProductContent"/>
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=740368&r1=740367&r2=740368&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Feb 3 18:18:49 2009
@@ -118,7 +118,7 @@
<simple-method method-name="updateTaskAssigment"
short-description="Update task to resource assignment, if required create a new one by re-assigment">
- <field-to-result map-name="parameters" field="workEffortId"/>
+ <field-to-result field="parameters.workEffortId"/>
<if>
<!-- check if a change in partyId Or roletypeId: need to delete and create new -->
<condition>
@@ -239,7 +239,7 @@
2. call a recursive java function to set all the dependant tasks.
-->
- <field-to-result map-name="parameters" field="projectId"/>
+ <field-to-result field="parameters.projectId"/>
<!-- find a starting point being either the estimated start date of a project or the earliest actual start date. -->
<entity-condition entity-name="ProjectAndPhaseAndTask" list="tasks">
@@ -515,7 +515,7 @@
</entity-one>
<if-empty field="project">
- <field-to-result map-name="parameters" field="projectId"/>
+ <field-to-result field="parameters.projectId"/>
<add-error error-list-name="error_list"><fail-message message="Project: ${parameters.projectId} not found"/></add-error>
</if-empty>
<if-not-empty field="parameters.workEffortName">