svn commit: r740825 - 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: Wed Feb  4 19:01:58 2009
New Revision: 740825

URL: http://svn.apache.org/viewvc?rev=740825&view=rev
Log:
1) <field-to-result map-name="(.*)" field="(.*)" result-name="(.*)"/> => <field-to-result  field="$1.$2" result-name="$3"/>
then
2) <field-to-result map.*="(.*)" field.*="(.*)"/> => <field-to-result field="$1.$2" result-name="$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=740825&r1=740824&r2=740825&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 Wed Feb  4 19:01:58 2009
@@ -30,7 +30,7 @@
         </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-result field="newValue.contactMechId" result-name="contactMechId"/>
         <field-to-request map-name="newValue" field-name="contactMechId"/>
         <log level="info" message="Contact mech created with id ${newValue.contactMechId}"/>    
     </simple-method>
@@ -74,11 +74,11 @@
                 <default-message resource="PartyUiLabels" property="${successMessageProperty}"/>
                 <result-to-field result-name="contactMechId" map-name="newValue"/>
             </call-service>                                        
-            <field-to-result map-name="newValue" field="contactMechId"/>
+            <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
             <field-to-request map-name="newValue" field-name="contactMechId"/>
             <else>
                 <log level="info" message="Contact mech not changed"/>
-                <field-to-result map-name="oldValue" field="contactMechId"/>
+                <field-to-result field="oldValue.contactMechId" result-name="contactMechId"/>
                 <field-to-request map-name="oldValue" field-name="contactMechId"/>
             </else>            
         </if-compare-field>
@@ -108,7 +108,7 @@
         </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-result field="newValue.contactMechId" result-name="contactMechId"/>
         <field-to-request map-name="newValue" field-name="contactMechId"/>            
     </simple-method>
     
@@ -158,8 +158,8 @@
             </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-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,7 +171,7 @@
         </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-result field="newValue.contactMechId" result-name="contactMechId"/>
         <field-to-request map-name="newValue" field-name="contactMechId"/>            
     </simple-method>
     
@@ -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">

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=740825&r1=740824&r2=740825&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 Wed Feb  4 19:01:58 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=740825&r1=740824&r2=740825&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 Wed Feb  4 19:01:58 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" result-name="contentId"/>
+        <field-to-result field="newEntity.productCategoryId" result-name="productCategoryId"/>
+        <field-to-result field="newEntity.prodCatContentTypeId" result-name="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=740825&r1=740824&r2=740825&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 Wed Feb  4 19:01:58 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" result-name="contentId"/>
+        <field-to-result field="newEntity.configItemId" result-name="configItemId"/>
+        <field-to-result field="newEntity.confItemContentTypeId" result-name="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=740825&r1=740824&r2=740825&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 Wed Feb  4 19:01:58 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" result-name="contentId"/>
+        <field-to-result field="newEntity.productId" result-name="productId"/>
+        <field-to-result field="newEntity.productContentTypeId" result-name="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=740825&r1=740824&r2=740825&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Feb  4 19:01:58 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" result-name="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" result-name="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" result-name="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">