svn commit: r730618 - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/test/ applications/content/script/org/ofbiz/content/content/ applications/content/script/org/ofbiz/content/layout/ applications/manufacturing/script/org/ofbiz/ma...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r730618 - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/test/ applications/content/script/org/ofbiz/content/content/ applications/content/script/org/ofbiz/content/layout/ applications/manufacturing/script/org/ofbiz/ma...

jleroux@apache.org
Author: jleroux
Date: Thu Jan  1 14:24:28 2009
New Revision: 730618

URL: http://svn.apache.org/viewvc?rev=730618&view=rev
Log:
AutoAcctgTransTests.xml : <get-related value-name => <get-related value-field (was missing from previous commits, I guess because of Eclipse replace options which is not working on open file if also modified by hand, I suppose for conflict reasons, but without any mentions <= bad ;o)

<result-to-field(.*)map-name="(.*)" +field="(.*)" => <result-to-field$1field="$2.$3"

I have also some other files with minilang tags changes but with other not related changes waiting (like minipoll issue, geoPoint, etc.)

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.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/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml?rev=730618&r1=730617&r2=730618&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml Thu Jan  1 14:24:28 2009
@@ -100,9 +100,9 @@
         <entity-one entity-name="Invoice" value-name="invoice">
             <field-map field-name="invoiceId" env-name="invoiceId"/>
         </entity-one>
-        <get-related value-name="invoice" relation-name="AcctgTrans" list-name="acctgTransList"/>
+        <get-related value-field="invoice" relation-name="AcctgTrans" list-name="acctgTransList"/>
         <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
-        <get-related value-name="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
+        <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
         
         <set field="debitTotal" type="Double" value="0.0"/>
         <set field="creditTotal" type="Double" value="0.0"/>
@@ -154,9 +154,9 @@
         <entity-one entity-name="Payment" value-name="payment">
             <field-map field-name="paymentId" env-name="paymentId"/>
         </entity-one>
-        <get-related value-name="payment" relation-name="AcctgTrans" list-name="acctgTransList"/>
+        <get-related value-field="payment" relation-name="AcctgTrans" list-name="acctgTransList"/>
         <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
-        <get-related value-name="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
+        <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
 
         <set field="debitTotal" type="Double" value="0.0"/>
         <set field="creditTotal" type="Double" value="0.0"/>
@@ -274,9 +274,9 @@
         <entity-one entity-name="Invoice" value-name="invoice">
             <field-map field-name="invoiceId" env-name="invoiceId"/>
         </entity-one>
-        <get-related value-name="invoice" relation-name="AcctgTrans" list-name="acctgTransList"/>
+        <get-related value-field="invoice" relation-name="AcctgTrans" list-name="acctgTransList"/>
         <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
-        <get-related value-name="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
+        <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
 
         <assert><not><if-empty field="acctgTransEntries"/></not></assert>
         <iterate entry-name="acctgTransEntry" list-name="acctgTransEntries">
@@ -323,9 +323,9 @@
         <entity-one entity-name="Payment" value-name="payment">
             <field-map field-name="paymentId" env-name="paymentId"/>
         </entity-one>
-        <get-related value-name="payment" relation-name="AcctgTrans" list-name="acctgTransList"/>
+        <get-related value-field="payment" relation-name="AcctgTrans" list-name="acctgTransList"/>
         <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
-        <get-related value-name="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
+        <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntries"/>
         <set field="debitTotal" type="Double" value="0.0"/>
         <set field="creditTotal" type="Double" value="0.0"/>
 
@@ -421,7 +421,7 @@
         <assert><not><if-empty field="acctgTransList"/></not></assert>
 
         <iterate list-name="acctgTransList" entry-name="acctgTrans">
-            <get-related list-name="acctgTransEntryList" relation-name="AcctgTransEntry" value-name="acctgTrans"/>
+            <get-related list-name="acctgTransEntryList" relation-name="AcctgTransEntry" value-field="acctgTrans"/>
             <assert><not><if-empty field="acctgTransEntryList"/></not></assert>
             <iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
                 <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
@@ -470,10 +470,10 @@
         <entity-one entity-name="WorkEffort" value-name="workEffort">
             <field-map field-name="workEffortId" env-name="workEffortId"/>
         </entity-one>
-        <get-related  value-name="workEffort" relation-name="AcctgTrans" list-name="acctgTransList"/>
+        <get-related value-field="workEffort" relation-name="AcctgTrans" list-name="acctgTransList"/>
         <assert><not><if-empty field="acctgTransList"></if-empty></not></assert>
         <iterate list-name="acctgTransList" entry-name="acctgTrans">
-            <get-related value-name="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntryList"/>
+            <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list-name="acctgTransEntryList"/>
             <iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
                 <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
                     <assert>

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=730618&r1=730617&r2=730618&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 Thu Jan  1 14:24:28 2009
@@ -604,7 +604,7 @@
             <result-to-field result-name="dataResourceId" map-name="createPlainBodyContent"/>
         </call-service>
         <call-service service-name="createContent" in-map-name="createPlainBodyContent">
-            <result-to-field result-name="contentId" map-name="createBodyAssoc" field="contentIdTo"/>
+            <result-to-field result-name="contentId" field="createBodyAssoc.contentIdTo"/>
         </call-service>
         <!-- Create content assoc between subject and plain body -->
         <set value="TREE_CHILD" field="createBodyAssoc.contentAssocTypeId"/>
@@ -617,7 +617,7 @@
             <result-to-field result-name="dataResourceId" map-name="createHtmlBodyContent"/>
         </call-service>
         <call-service service-name="createContent" in-map-name="createHtmlBodyContent">
-            <result-to-field result-name="contentId" map-name="createBodyAssoc" field="contentIdTo"/>
+            <result-to-field result-name="contentId" field="createBodyAssoc.contentIdTo"/>
         </call-service>
         <!-- Create content assoc between subject and html body -->
         <set value="htmlBody" field="createBodyAssoc.mapKey"/>

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=730618&r1=730617&r2=730618&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 Thu Jan  1 14:24:28 2009
@@ -113,10 +113,10 @@
         <set field="context.contentTypeId" value="DOCUMENT"/>
 
         <call-service in-map-name="context" service-name="persistContentAndAssoc">
-            <result-to-field map-name="context2" field="activeContentId" result-name="contentId"/>
+            <result-to-field field="context2.activeContentId" result-name="contentId"/>
             <result-to-field field="dataResourceId" result-name="dataResourceId"/>
-            <result-to-field map-name="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/>
-            <result-to-field map-name="context2" field="fromDate" result-name="fromDate"/>
+            <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
+            <result-to-field field="context2.fromDate" result-name="fromDate"/>
         </call-service>
         <check-errors/>
 
@@ -209,10 +209,10 @@
         <set field="context.contentTypeId" value="DOCUMENT"/>
 
         <call-service in-map-name="context" service-name="persistContentAndAssoc">
-            <result-to-field map-name="context2" field="activeContentId" result-name="contentId"/>
+            <result-to-field field="context2.activeContentId" result-name="contentId"/>
             <result-to-field field="dataResourceId" result-name="dataResourceId"/>
-            <result-to-field map-name="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/>
-            <result-to-field map-name="context2" field="fromDate" result-name="fromDate"/>
+            <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
+            <result-to-field field="context2.fromDate" result-name="fromDate"/>
         </call-service>
         <check-errors/>
 
@@ -267,10 +267,10 @@
         <set field="context.contentTypeId" value="DOCUMENT"/>
 
         <call-service in-map-name="context" service-name="persistContentAndAssoc">
-            <result-to-field map-name="context2" field="activeContentId" result-name="contentId"/>
+            <result-to-field field="context2.activeContentId" result-name="contentId"/>
             <result-to-field field="dataResourceId" result-name="dataResourceId"/>
-            <result-to-field map-name="context2" field="contentAssocTypeId" result-name="contentAssocTypeId"/>
-            <result-to-field map-name="context2" field="fromDate" result-name="fromDate"/>
+            <result-to-field field="context2.contentAssocTypeId" result-name="contentAssocTypeId"/>
+            <result-to-field field="context2.fromDate" result-name="fromDate"/>
         </call-service>
         <check-errors/>
 

Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml?rev=730618&r1=730617&r2=730618&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml Thu Jan  1 14:24:28 2009
@@ -30,7 +30,7 @@
                 processor-name="copyRoutingTask" in-map-name="lookedUpValue" out-map-name="context"/>
             <call-service service-name="createWorkEffort" in-map-name="context">
                 <default-message resource="ManufacturingUiLabels" property="ManufacturingRoutingTaskCopiedSuccessfully"/>
-                <result-to-field result-name="workEffortId" map-name="parameters" field="workEffortIdTo"/>
+                <result-to-field result-name="workEffortId" field="parameters.workEffortIdTo"/>
             </call-service>
         </if-compare>
         <if-empty field="parameters.fromDate">

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=730618&r1=730617&r2=730618&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 Thu Jan  1 14:24:28 2009
@@ -185,7 +185,7 @@
         <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
         <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
-            <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field="contactMechId" />            
+            <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId" />            
         </call-service>
 
         <set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/>
@@ -232,7 +232,7 @@
         <set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>          
         <call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
-            <result-to-field result-name="contactMechId" map-name="newPartyContactMech" field="contactMechId" />            
+            <result-to-field result-name="contactMechId" field="newPartyContactMech.contactMechId" />            
         </call-service>
         
         <set-service-fields service-name="updatePartyContactMech" map="parameters" to-map="updatePartyContactMechMap"/>

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=730618&r1=730617&r2=730618&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 Thu Jan  1 14:24:28 2009
@@ -173,7 +173,7 @@
         <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
         <call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
             <default-message>Postal Address successfully updated</default-message>
-            <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field="contactMechId" />
+            <result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId" />
         </call-service>
 
         <set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
@@ -220,7 +220,7 @@
         <set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>
         <call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap">
             <default-message>Telecom Number successfully updated</default-message>
-            <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field="contactMechId" />
+            <result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId" />
         </call-service>
 
         <set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>

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=730618&r1=730617&r2=730618&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 Thu Jan  1 14:24:28 2009
@@ -431,7 +431,7 @@
                 processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>        
         <call-service in-map-name="context" service-name="updatePostalAddress">
             <default-message>Postal Address successfully updated</default-message>
-            <result-to-field result-name="contactMechId" map-name="newValue" field="contactMechId" />            
+            <result-to-field result-name="contactMechId" field="newValue.contactMechId" />            
         </call-service>
         <call-map-processor xml-resource="org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml"
                 processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/>  
@@ -482,7 +482,7 @@
                 processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>        
         <call-service in-map-name="context" service-name="updateTelecomNumber">
             <default-message>Telecom Number successfully updated</default-message>
-            <result-to-field result-name="contactMechId" map-name="newValue" field="contactMechId" />            
+            <result-to-field result-name="contactMechId" field="newValue.contactMechId" />            
         </call-service>
         
         <call-map-processor xml-resource="org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml"

Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?rev=730618&r1=730617&r2=730618&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Thu Jan  1 14:24:28 2009
@@ -25,7 +25,7 @@
         short-description="Create FixedAssetMaint and Update Schedule information in WorkEffort">
         <set-service-fields map="parameters" service-name="createFixedAssetMaint" to-map="createFixedAssetMaintCtx"/>
         <call-service service-name="createFixedAssetMaint" in-map-name="createFixedAssetMaintCtx">
-            <result-to-field result-name="maintHistSeqId" map-name="findAssetMaintLookup" field="maintHistSeqId"/>
+            <result-to-field result-name="maintHistSeqId" field="findAssetMaintLookup.maintHistSeqId"/>
             <result-to-request result-name="maintHistSeqId"/>
         </call-service>
         <check-errors/>