svn commit: r739764 [1/3] - in /ofbiz/trunk: applications/content/webapp/content/cms/ applications/content/webapp/content/layout/ applications/content/webapp/content/lookup/ applications/content/webapp/content/survey/ applications/content/widget/ appli...

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

svn commit: r739764 [1/3] - in /ofbiz/trunk: applications/content/webapp/content/cms/ applications/content/webapp/content/layout/ applications/content/webapp/content/lookup/ applications/content/webapp/content/survey/ applications/content/widget/ appli...

jleroux@apache.org
Author: jleroux
Date: Sun Feb  1 13:54:08 2009
New Revision: 739764

URL: http://svn.apache.org/viewvc?rev=739764&view=rev
Log:
<field-map(.*)env-name => <field-map$1from-field
<service(.*)result-map-name => <service$1result-map

Modified:
    ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
    ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
    ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
    ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
    ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
    ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
    ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
    ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
    ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml
    ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
    ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml
    ofbiz/trunk/applications/workeffort/widget/LookupForms.xml
    ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
    ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortTrees.xml
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/framework/common/widget/LookupForms.xml
    ofbiz/trunk/framework/common/widget/PortalPageForms.xml
    ofbiz/trunk/framework/common/widget/PortletEditForms.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml
    ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
    ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Sun Feb  1 13:54:08 2009
@@ -36,8 +36,8 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="requestParameters"/>
-                <field-map field-name="entityName" env-name="entityName"/>
+                <field-map field-name="inputFields" from-field="requestParameters"/>
+                <field-map field-name="entityName" from-field="entityName"/>
             </service>
         </actions>
     

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Sun Feb  1 13:54:08 2009
@@ -151,8 +151,8 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
           <actions>
             <set field="requestParameters.contentTypeId" value="DOCUMENT"/>
-              <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                  <field-map field-name="inputFields" env-name="parameters"/>
+              <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                  <field-map field-name="inputFields" from-field="parameters"/>
                   <field-map field-name="entityName" value="ContentDataResourceView"/>
               </service>
           </actions>

Modified: ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Sun Feb  1 13:54:08 2009
@@ -76,8 +76,8 @@
     <form name="listLookupDataResourceContent" default-entity-name="DataResourceContentView" list-name="listIt" target="" title="" type="list"
         paginate-target="LookupSubContent" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="DataResourceContentView"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Sun Feb  1 13:54:08 2009
@@ -38,8 +38,8 @@
     <form name="ListFindSurvey" target="" title="" list-name="listIt" type="list" paginate-target="FindSurvey"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service result-map-list-name="listIt" result-map="result" service-name="performFind">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Survey"/>
             </service>
         </actions>
@@ -255,8 +255,8 @@
     <form name="ListFindSurveyResponse" list-name="listIt" title="" type="list" paginate-target="FindSurveyResponse"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="SurveyResponse"/>
             </service>
         </actions>
@@ -280,8 +280,8 @@
     <form name="listLookupSurvey" list-name="listIt" title="" type="list" paginate-target="LookupSurvey"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Survey"/>
             </service>
         </actions>
@@ -301,8 +301,8 @@
     <form name="listLookupSurveyResponse" list-name="listIt" title="" type="list" paginate-target="LookupSurveyResponse"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="SurveyResponse"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Feb  1 13:54:08 2009
@@ -309,8 +309,8 @@
     <screen name="responseTreeLine">
         <section>
             <actions>
-                <service service-name="getContentAndDataResource" result-map-name="contentData">
-                    <field-map field-name="contentId" env-name="rsp.contentId"/>
+                <service service-name="getContentAndDataResource" result-map="contentData">
+                    <field-map field-name="contentId" from-field="rsp.contentId"/>
                 </service>
                 <set field="textData" from-field="contentData.resultData.electronicText.textData"/>
             </actions>

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sun Feb  1 13:54:08 2009
@@ -110,7 +110,7 @@
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
                 <entity-one entity-name="WebSite" value-field="webSite"/>
                 <entity-and entity-name="WebSiteContent" list-name="webSiteContent">
-                    <field-map field-name="webSiteId" env-name="webSiteId"/>
+                    <field-map field-name="webSiteId" from-field="webSiteId"/>
                 </entity-and>                
             </actions>
             <widgets>
@@ -284,19 +284,19 @@
                 <entity-one entity-name="WebSite" value-field="webSite"/>
                 <entity-one entity-name="Content" value-field="content"/>
                 <entity-one entity-name="DataResource" value-field="dataResource">
-                    <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
                 </entity-one>
                 <entity-one entity-name="ElectronicText" value-field="dataText">
-                    <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
                 </entity-one>
                 <entity-one entity-name="ContentAssoc" value-field="assoc">
-                    <field-map field-name="contentId" env-name="parameters.contentIdFrom"/>
-                    <field-map field-name="contentIdTo" env-name="parameters.contentId"/>
-                    <field-map field-name="contentAssocTypeId" env-name="parameters.contentAssocTypeId"/>
-                    <field-map field-name="fromDate" env-name="parameters.fromDate"/>
+                    <field-map field-name="contentId" from-field="parameters.contentIdFrom"/>
+                    <field-map field-name="contentIdTo" from-field="parameters.contentId"/>
+                    <field-map field-name="contentAssocTypeId" from-field="parameters.contentAssocTypeId"/>
+                    <field-map field-name="fromDate" from-field="parameters.fromDate"/>
                 </entity-one>
                 <entity-and entity-name="ContentPurpose" list-name="currentPurposes">
-                    <field-map field-name="contentId" env-name="contentId"/>                    
+                    <field-map field-name="contentId" from-field="contentId"/>                    
                 </entity-and>
                 <entity-condition entity-name="ContentPurposeType" list="purposeTypes">
                     <order-by field-name="description"/>
@@ -337,10 +337,10 @@
                 <entity-one entity-name="WebSite" value-field="webSite"/>
                 <entity-one entity-name="Content" value-field="content"/>
                 <entity-one entity-name="DataResource" value-field="dataResource">
-                    <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
                 </entity-one>
                 <entity-one entity-name="ElectronicText" value-field="dataText">
-                    <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -380,8 +380,8 @@
                 <entity-one entity-name="WebSite" value-field="webSite"/>
                 <entity-one entity-name="Content" value-field="content"/>
                 <entity-and entity-name="WebSitePathAlias" list-name="aliases">
-                    <field-map field-name="webSiteId" env-name="webSiteId"/>
-                    <field-map field-name="contentId" env-name="contentId"/>
+                    <field-map field-name="webSiteId" from-field="webSiteId"/>
+                    <field-map field-name="contentId" from-field="contentId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -401,7 +401,7 @@
                 <entity-one entity-name="WebSite" value-field="webSite"/>
                 <set field="tabButtonItem" value="PathAlias"/>
                 <entity-and entity-name="WebSitePathAlias" list-name="aliases">
-                    <field-map field-name="webSiteId" env-name="parameters.webSiteId"/>
+                    <field-map field-name="webSiteId" from-field="parameters.webSiteId"/>
                 </entity-and>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Sun Feb  1 13:54:08 2009
@@ -26,8 +26,8 @@
             <actions>
                 <set field="titleProperty" value="PageTitleFindCMSContent"/>
                 <set field="entityName" value="ContentAssocDataResourceViewFrom"/>
-                <service service-name="urlEncodeArgs" result-map-name="result">
-                    <field-map env-name="requestParameters" field-name="mapIn"/>
+                <service service-name="urlEncodeArgs" result-map="result">
+                    <field-map from-field="requestParameters" field-name="mapIn"/>
                 </service>
                 <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -63,10 +63,10 @@
                 <script location="component://content/widget/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditCMSContent"/>
                 <entity-one entity-name="Content" value-field="currentValue">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
                 </entity-one>
                 <entity-one entity-name="ElectronicText" value-field="electronicText">
-                    <field-map field-name="dataResourceId" env-name="parameters.drDataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="parameters.drDataResourceId"/>
                 </entity-one>
                 <set field="textData" from-field="electronicText.textData"/>
                 <set field="contentId" from-field="currentValue.contentId"/>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sun Feb  1 13:54:08 2009
@@ -41,8 +41,8 @@
     <form name="ListCompDoc" type="list" list-name="listIt" target="" paginate-target="FindCompDoc"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Content"/>
             </service>
         </actions>
@@ -460,8 +460,8 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="ContentRevisionItemAndContentApprovalView" use-cache="true">
-                <field-map env-name="contentId" field-name="contentId"/>
-                <field-map env-name="contentRevisionSeqId" field-name="contentRevisionSeqId"/>
+                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map from-field="contentRevisionSeqId" field-name="contentRevisionSeqId"/>
             </entity-and>
         </actions>
         <field name="contentId"><display/></field>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sun Feb  1 13:54:08 2009
@@ -29,8 +29,8 @@
                 <set field="contentId" from-field="parameters.rootContentId" default-value="${parameters.contentId}"/>
                 <set field="contentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}"/>
 
-                <service service-name="getMostRecentRevision" result-map-name="revisionResult">
-                    <field-map field-name="contentId" env-name="rootContentId"/>
+                <service service-name="getMostRecentRevision" result-map="revisionResult">
+                    <field-map field-name="contentId" from-field="rootContentId"/>
                 </service>        
                 <set field="mostRecentRevisionSeqId" from-field="revisionResult.mostRecentRevisionSeqId"/>
                 
@@ -38,9 +38,9 @@
                 <set field="currentMenuItemName" value="approval"/>
                 <entity-one entity-name="Content" value-field="content" use-cache="true"/>
                 <set from-field="content.contentTypeId" field="contentTypeId"/>
-                <service service-name="getApprovalsWithPermissions" result-map-name="result">
-                    <field-map field-name="rootContentId" env-name="contentId"/>
-                    <field-map field-name="contentRevisionSeqId" env-name="contentRevisionSeqId"/>
+                <service service-name="getApprovalsWithPermissions" result-map="result">
+                    <field-map field-name="rootContentId" from-field="contentId"/>
+                    <field-map field-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
                     <field-map field-name="checkPermission" value="false"/>
                 </service>
                 
@@ -117,7 +117,7 @@
                 <set field="titleProperty" value="ContentCompDocViewWaitingApprovals"/>
                 <set field="menuName" value="tree"/>
                 <set field="currentMenuItemName" value="approval"/>
-                <service service-name="checkForWaitingApprovals" result-map-name="result">
+                <service service-name="checkForWaitingApprovals" result-map="result">
                 </service>
                 
                 <set field="contentApprovalList" from-field="result.contentApprovalList"/>
@@ -154,12 +154,12 @@
                 <set field="currentMenuItemName" value="approval"/>
                 
                 <entity-one entity-name="ContentApproval" value-field="contentApproval" use-cache="true">
-                    <field-map env-name="parameters.contentApprovalId" field-name="contentApprovalId"/>
+                    <field-map from-field="parameters.contentApprovalId" field-name="contentApprovalId"/>
                 </entity-one>
                 <set from-field="contentApproval.contentId" field="rootContentId"/>
                 <set from-field="contentApproval.contentRevisionSeqId" field="rootContentRevisionSeqId"/>
                 <entity-one entity-name="Content" value-field="content" use-cache="true">
-                    <field-map field-name="contentId" env-name="contentApproval.contentId"/>
+                    <field-map field-name="contentId" from-field="contentApproval.contentId"/>
                 </entity-one>
                 <set from-field="content.contentTypeId" field="contentTypeId"/>
                 <set field="title" value="${uiLabelMap.PageTitleEditContentApprovalEditPage} ${contentApproval.contentApprovalId}"/>
@@ -202,11 +202,11 @@
                 <set field="currentMenuItemName" value="revision"/>
 
                 <entity-one entity-name="Content" value-field="content" use-cache="true">
-                    <field-map field-name="contentId" env-name="contentId"/>
+                    <field-map field-name="contentId" from-field="contentId"/>
                 </entity-one>
                 <set from-field="content.contentTypeId" field="contentTypeId"/>
                 <entity-and entity-name="ContentRevision" list-name="contentRevisionList" use-cache="true">
-                    <field-map env-name="contentId" field-name="contentId"/>
+                    <field-map from-field="contentId" field-name="contentId"/>
                 </entity-and>
 
                 <set field="title" value="${uiLabelMap.ContentCompDocRevisionListPageForContent} ${rootContentId} ${uiLabelMap.ContentCompDocRev} ${rootContentRevisionSeqId}"/>
@@ -290,8 +290,8 @@
                 <set field="title" value="${uiLabelMap.ContentCompDocRevisionListPageForContent} ${rootContentId} ${uiLabelMap.ContentCompDocRevisions} ${rootContentRevisionSeqId}"/>
                     
                 <entity-and entity-name="ContentRevisionItem" list-name="contentRevisionItemList" use-cache="true">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
-                    <field-map field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
+                    <field-map field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -442,7 +442,7 @@
                 <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="contentTypeId" value="COMPDOC_TEMPLATE"/>
                 <entity-and entity-name="Content" list-name="compDocFindList">
-                    <field-map field-name="instanceOfContentId" env-name="parameters.rootContentId"/>
+                    <field-map field-name="instanceOfContentId" from-field="parameters.rootContentId"/>
                     <field-map field-name="contentTypeId" value="COMPDOC_INSTANCE"/>
                 </entity-and>
                 <set field="title" value="${uiLabelMap.ContentCompDocViewInstances} ${parameters.rootContentId}"/>
@@ -479,7 +479,7 @@
                 <set from-field="contentId" field="rootContentId"/>
                 <entity-one entity-name="Content" value-field="content" use-cache="false"/>
                 <entity-one entity-name="DataResource" value-field="dataResource" use-cache="false">
-                    <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
                 </entity-one>
                 <set from-field="dataResource.mimeTypeId" field="mimeTypeId"/>
                 <set from-field="content.contentTypeId" field="contentTypeId"/>
@@ -575,20 +575,20 @@
                 <set field="contentId" from-field="parameters.contentId"/>
                 <set field="rootContentId" from-field="parameters.rootContentId" default-value="${parameters.caContentIdTo}"/>
                 <!-- need to get the latest rootContentRevisionSeqId -->
-                <service service-name="getMostRecentRevision" result-map-name="revisionResult">
-                    <field-map field-name="contentId" env-name="rootContentId"/>
+                <service service-name="getMostRecentRevision" result-map="revisionResult">
+                    <field-map field-name="contentId" from-field="rootContentId"/>
                 </service>        
                 <set field="mostRecentRevisionSeqId" from-field="revisionResult.mostRecentRevisionSeqId"/>
                 <set field="rootContentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}"/>
                 <set field="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId" default-value="${mostRecentRevisionSeqId}"/>
                 
                 <entity-one entity-name="Content" value-field="itemContent" use-cache="false">
-                    <field-map field-name="contentId" env-name="contentId"/>
+                    <field-map field-name="contentId" from-field="contentId"/>
                 </entity-one>
                 <entity-one entity-name="ContentAssoc" value-field="contentAssoc">
-                    <field-map field-name="contentIdTo" env-name="rootContentId"/>
-                    <field-map field-name="contentId" env-name="contentId"/>
-                    <field-map field-name="fromDate" env-name="parameters.caFromDate"/>
+                    <field-map field-name="contentIdTo" from-field="rootContentId"/>
+                    <field-map field-name="contentId" from-field="contentId"/>
+                    <field-map field-name="fromDate" from-field="parameters.caFromDate"/>
                     <field-map field-name="contentAssocTypeId" value="COMPDOC_PART"/>
                 </entity-one>
                 
@@ -608,7 +608,7 @@
                 <set field="itemContentRevisionSeqId" from-field="parameters.itemContentRevisionSeqId" default-value="${contentRevisionItems[0].contentRevisionSeqId}"/>
                 <set field="dataResourceId" from-field="contentRevisionItems[0].newDataResourceId" default-value="${itemContent.dataResourceId}"/>
                 <entity-one entity-name="DataResource" value-field="dataResource" use-cache="false">
-                    <field-map field-name="dataResourceId" env-name="dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="dataResourceId"/>
                 </entity-one>
                 <set field="mimeTypeId" from-field="dataResource.mimeTypeId"/>
             </actions>
@@ -681,10 +681,10 @@
                         <set from-field="rootRevList[0].maxRevisionSeqId" field="rootInstanceRevSeqId"/>
                             -->
                         <entity-one entity-name="Content" value-field="templateContent" use-cache="false">
-                            <field-map field-name="contentId" env-name="itemContent.instanceOfContentId"/>
+                            <field-map field-name="contentId" from-field="itemContent.instanceOfContentId"/>
                         </entity-one>
                         <entity-one entity-name="DataResource" value-field="templateDataResource" use-cache="false">
-                            <field-map field-name="dataResourceId" env-name="templateContent.dataResourceId"/>
+                            <field-map field-name="dataResourceId" from-field="templateContent.dataResourceId"/>
                         </entity-one>
                     </actions>
                     <widgets>
@@ -823,7 +823,7 @@
                     </condition>
                     <actions>
                         <entity-one entity-name="ElectronicText" value-field="electronicText">
-                            <field-map field-name="dataResourceId" env-name="dataResource.dataResourceId"/>
+                            <field-map field-name="dataResourceId" from-field="dataResource.dataResourceId"/>
                         </entity-one>
                         <set from-field="electronicText.textData" field="textData"/>
                     </actions>
@@ -927,7 +927,7 @@
                 </entity-condition>
                 <set from-field="parameters.rootContentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="rootContentRevisionSeqId"/>
                 <entity-one entity-name="Content" value-field="templateContent">
-                    <field-map field-name="contentId" env-name="rootContentId"/>
+                    <field-map field-name="contentId" from-field="rootContentId"/>
                 </entity-one>
                 <set from-field="templateContent.contentName" field="contentName"/>
                 
@@ -974,7 +974,7 @@
                 <set field="contentIdTo" from-field="parameters.rootContentId"/>
                 <set field="templateContentId" from-field="parameters.instanceOfContentId"/>
                 <entity-one entity-name="Content" value-field="templateContent">
-                    <field-map field-name="contentId" env-name="templateContentId"/>
+                    <field-map field-name="contentId" from-field="templateContentId"/>
                 </entity-one>
                 <set from-field="templateContent.contentName" field="contentName"/>
 
@@ -1035,8 +1035,8 @@
                 <set from-field="parameters.rootContentId" field="rootContentId"/>
                 <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
                 <set value="COMPDOC_TEMPLATE" field="contentTypeId"/>
-                <service service-name="getMostRecentRevision" result-map-name="revisionResult">
-                    <field-map field-name="contentId" env-name="rootContentId"/>
+                <service service-name="getMostRecentRevision" result-map="revisionResult">
+                    <field-map field-name="contentId" from-field="rootContentId"/>
                 </service>        
                 <set from-field="revisionResult.mostRecentRevisionSeqId" field="mostRecentRevisionSeqId"/>
                 <set from-field="parameters.rootContentRevisionSeqId" default-value="${mostRecentRevisionSeqId}" field="rootContentRevisionSeqId"/>
@@ -1071,14 +1071,14 @@
                    <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
                    <set value="COMPDOC_INSTANCE" field="contentTypeId"/>
                 
-                <service service-name="getMostRecentRevision" result-map-name="revisionResult">
-                    <field-map field-name="contentId" env-name="parameters.rootContentId"/>
+                <service service-name="getMostRecentRevision" result-map="revisionResult">
+                    <field-map field-name="contentId" from-field="parameters.rootContentId"/>
                 </service>        
                 <set from-field="revisionResult.mostRecentRevisionSeqId" field="mostRecentRevisionSeqId"/>
                 <set from-field="parameters.rootContentRevisionSeqId" default-value="${mostRecentRevisionSeqId}" field="rootContentRevisionSeqId"/>
                 
                 <entity-one entity-name="Content" value-field="instanceContent">
-                    <field-map field-name="contentId" env-name="rootContentId"/>
+                    <field-map field-name="contentId" from-field="rootContentId"/>
                 </entity-one>
                 <set from-field="instanceContent.instanceOfContentId" field="templateContentId"/>
                 <entity-condition entity-name="ContentRevision" list="contentTemplateRevisions" use-cache="true">
@@ -1118,12 +1118,12 @@
     <screen name="rootInstanceApprovalStatus">
         <section>
             <actions>
-                <service service-name="getFinalApprovalStatus" result-map-name="approvalStatusResult">
-                    <field-map field-name="contentId" env-name="rootContentId"/>
-                    <field-map field-name="contentRevisionSeqId" env-name="rootContentRevisionSeqId"/>
+                <service service-name="getFinalApprovalStatus" result-map="approvalStatusResult">
+                    <field-map field-name="contentId" from-field="rootContentId"/>
+                    <field-map field-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
                 </service>
                 <entity-one entity-name="StatusItem" value-field="statusItem">
-                    <field-map field-name="statusId" env-name="approvalStatusResult.approvalStatusId"/>
+                    <field-map field-name="statusId" from-field="approvalStatusResult.approvalStatusId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -1217,10 +1217,10 @@
                     <section>
                         <actions>
                             <entity-one entity-name="Content" value-field="instanceContent" auto-field-map="false">
-                                <field-map field-name="contentId" env-name="assocRevisionItemView.itemContentId"/>
+                                <field-map field-name="contentId" from-field="assocRevisionItemView.itemContentId"/>
                             </entity-one>
                             <entity-one entity-name="DataResource" value-field="instanceDataResource" auto-field-map="false">
-                                <field-map field-name="dataResourceId" env-name="instanceContent.dataResourceId"/>
+                                <field-map field-name="dataResourceId" from-field="instanceContent.dataResourceId"/>
                             </entity-one>
                         </actions>
                         <widgets>
@@ -1265,8 +1265,8 @@
                 <set field="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" to-scope="screen" default-value="${defaultContentRevisionSeqId}"/>
 
                 <entity-and entity-name="ContentRevisionItemAndContentApprovalView" use-cache="true" list-name="ContentRevAppList">
-                        <field-map env-name="contentId" field-name="contentId"/>
-                        <field-map env-name="contentRevisionSeqId" field-name="contentRevisionSeqId"/>
+                        <field-map from-field="contentId" field-name="contentId"/>
+                        <field-map from-field="contentRevisionSeqId" field-name="contentRevisionSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -1313,7 +1313,7 @@
             <actions>
                 <entity-one entity-name="Content" value-field="content" use-cache="true"/>
                 <entity-one entity-name="DataResource" value-field="dataResource" use-cache="true">
-                    <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
                 </entity-one>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml Sun Feb  1 13:54:08 2009
@@ -23,7 +23,7 @@
         default-render-style="simple" default-wrap-style="treeWrapper">
         <node name="node-root" wrap-style="treeWrapper">
             <entity-one entity-name="Content" use-cache="false">
-                <field-map field-name="contentId" env-name="rootContentId"/>
+                <field-map field-name="contentId" from-field="rootContentId"/>
             </entity-one>
             <include-screen name="rootTemplateLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
             <sub-node node-name="node-body">
@@ -55,7 +55,7 @@
         </node>
         <node name="node-body" join-field-name="itemContentId" entity-name="AssocRevisionItemView" wrap-style="treeWrapper">
             <entity-one entity-name="Content" use-cache="false">
-                <field-map field-name="contentId" env-name="itemContentId"/>
+                <field-map field-name="contentId" from-field="itemContentId"/>
             </entity-one>
             <include-screen name="childTemplateLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
             <sub-node node-name="node-body">
@@ -91,7 +91,7 @@
         default-render-style="simple" default-wrap-style="treeWrapper">
         <node name="node-root">
             <entity-one entity-name="Content" use-cache="false">
-                <field-map field-name="contentId" env-name="instanceContent.instanceOfContentId"/>
+                <field-map field-name="contentId" from-field="instanceContent.instanceOfContentId"/>
             </entity-one>
             <include-screen name="rootInstanceLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
             <sub-node node-name="node-body">
@@ -123,7 +123,7 @@
         </node>
         <node name="node-body" join-field-name="itemContentId" entity-name="AssocRevisionItemView">
             <entity-one entity-name="Content" use-cache="false">
-                <field-map field-name="contentId" env-name="itemContentId"/>
+                <field-map field-name="contentId" from-field="itemContentId"/>
             </entity-one>
             <include-screen name="childInstanceLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
             <sub-node node-name="node-body">

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sun Feb  1 13:54:08 2009
@@ -214,7 +214,7 @@
                 <set field="contentId" from-field="parameters.contentId"  />
                 <set field="contentRoleTarget" value=""/>
                 <entity-one entity-name="Content" value-field="currentValue">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -238,7 +238,7 @@
                 <set field="tabButtonItem" value="purpose"/>
                 <set field="contentId" from-field="parameters.contentId"  />
                 <entity-one entity-name="Content" value-field="currentValue">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -262,7 +262,7 @@
                 <set field="tabButtonItem" value="attribute"/>
                 <set field="contentId" from-field="parameters.contentId"  />
                 <entity-one entity-name="Content" value-field="currentValue">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -289,7 +289,7 @@
                     <order-by field-name="webSiteId"/>
                 </entity-condition>
                 <entity-one entity-name="Content" value-field="currentValue">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -322,7 +322,7 @@
                 <set field="tabButtonItem" value="metaData"/>
                 <set field="contentId" from-field="parameters.contentId"  />
                 <entity-one entity-name="Content" value-field="currentValue">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -346,7 +346,7 @@
                 <set field="tabButtonItem" value="workEffort"/>
                 <set field="contentId" from-field="parameters.contentId"  />
                 <entity-one entity-name="Content" value-field="currentValue">
-                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                    <field-map field-name="contentId" from-field="parameters.contentId"/>
                 </entity-one>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sun Feb  1 13:54:08 2009
@@ -60,8 +60,8 @@
     <form name="ListDataResource" target="" title="" list-name="listIt" type="list" paginate-target="findDataResource"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-          <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-            <field-map field-name="inputFields" env-name="parameters"/>
+          <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+            <field-map field-name="inputFields" from-field="parameters"/>
             <field-map field-name="entityName" value="DataResource"/>
             <field-map field-name="orderBy" value="dataResourceId"/>
           </service>
@@ -117,7 +117,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="DataResource"/>
                 <field-map field-name="orderBy" value="dataResourceId"/>
             </service>
@@ -139,7 +139,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false">
-                <field-map field-name="statusId" env-name="currentValue.statusId"/>
+                <field-map field-name="statusId" from-field="currentValue.statusId"/>
             </entity-one>
         </actions>
         <alt-target use-when="currentValue==null" target="createDataResource"/>
@@ -195,7 +195,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="Content" list-name="contentRecords">
-                <field-map field-name="dataResourceId" env-name="dataResourceId"/>
+                <field-map field-name="dataResourceId" from-field="dataResourceId"/>
                 <order-by field-name="contentId"/>
             </entity-and>
         </actions>
@@ -333,8 +333,8 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
-                <field-map field-name="entityName" env-name="entityName" value="DataResourceAttribute"/>
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" from-field="entityName" value="DataResourceAttribute"/>
             </service>
         </actions>
         <auto-fields-service service-name="updateDataResourceAttribute" default-field-type="display"/>
@@ -362,8 +362,8 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
-                <field-map field-name="entityName" env-name="entityName" value="DataResourceRole"/>
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" from-field="entityName" value="DataResourceRole"/>
             </service>
         </actions>
         <auto-fields-service service-name="updateDataResourceRole" default-field-type="display"/>
@@ -386,8 +386,8 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
-                <field-map field-name="entityName" env-name="entityName" value="ProductFeatureDataResource"/>
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" from-field="entityName" value="ProductFeatureDataResource"/>
             </service>
         </actions>
         <auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/>      

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun Feb  1 13:54:08 2009
@@ -231,7 +231,7 @@
                 <set field="headerItem" value="DataResource"/>
                 <set field="tabButtonItem" value="uploadImage"/>
                 <entity-one entity-name="DataResource" value-field="currentValue">
-                    <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -393,7 +393,7 @@
                 <set field="headerItem" value="DataResource"/>
                 <set field="tabButtonItem" value="editDataResourceAttribute"/>
                 <entity-one entity-name="DataResource" value-field="currentValue">
-                    <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
                 </entity-one>
                 <get-related value-name="currentValue" relation-name="DataResourceAttribute" list-name="dataResourceAttribute"/>
             </actions>
@@ -416,7 +416,7 @@
                 <set field="headerItem" value="DataResource"/>
                 <set field="tabButtonItem" value="editDataResourceRole"/>
                 <entity-one entity-name="DataResource" value-field="currentValue">
-                    <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
                 </entity-one>
                 <get-related value-name="currentValue" relation-name="DataResourceRole" list-name="dataResourceRole"/>
             </actions>
@@ -439,7 +439,7 @@
                 <set field="headerItem" value="DataResource"/>
                 <set field="tabButtonItem" value="editDataResourceProductFeatures"/>
                 <entity-one entity-name="DataResource" value-field="currentValue">
-                    <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
                 </entity-one>
                 <get-related value-name="currentValue" relation-name="ProductFeatureDataResource" list-name="productFeatureDataResource"/>
             </actions>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sun Feb  1 13:54:08 2009
@@ -112,8 +112,8 @@
     <form name="ListForumMessages" type="list" list-name="forumMessages" separate-columns="true" target="updateForumMessage"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <row-actions>
-            <service service-name="getContentAndDataResource" result-map-name="contentData">
-                <field-map field-name="contentId" env-name="contentId"/>
+            <service service-name="getContentAndDataResource" result-map="contentData">
+                <field-map field-name="contentId" from-field="contentId"/>
             </service>
         </row-actions>
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
@@ -136,8 +136,8 @@
     <form name="EditForumMessage" type="single" target="updateForumMessage" default-map-name="message"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <service service-name="getContentAndDataResource" result-map-name="contentData">
-                <field-map field-name="contentId" env-name="parameters.forumMessageId"/>
+            <service service-name="getContentAndDataResource" result-map="contentData">
+                <field-map field-name="contentId" from-field="parameters.forumMessageId"/>
             </service>
             <set field="message.forumMessageId" from-field="contentData.resultData.content.contentId"/>
             <set field="message.contentTypeId" from-field="contentData.resultData.content.contentTypeId"/>
@@ -146,8 +146,8 @@
             <set field="message.forumMessageTitle" from-field="contentData.resultData.content.description"/>
             <set field="message.forumMessageText" from-field="contentData.resultData.electronicText.textData"/>
             <entity-and entity-name="ContentAssoc" list-name="contentAssocList" filter-by-date="true">
-                <field-map field-name="contentId" env-name="message.forumMessageId"/>
-                <field-map field-name="contentIdTo" env-name="message.contentIdTo"/>
+                <field-map field-name="contentId" from-field="message.forumMessageId"/>
+                <field-map field-name="contentIdTo" from-field="message.contentIdTo"/>
                 <field-map field-name="contentAssocTypeId" value="RESPONSE"/>
             </entity-and>
             <set field="contentAssoc" from-field="contentAssocList[0]" />

Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Sun Feb  1 13:54:08 2009
@@ -89,12 +89,12 @@
                 <set field="tabBar" value="ForumGroupTabBar"/>
                 <set field="forumGroupId" from-field="parameters.forumGroupId" default-value="parameters.contentId"/>
                 <entity-one entity-name="Content" value-field="forumGroup">
-                    <field-map field-name="contentId" env-name="forumGroupId"/>
+                    <field-map field-name="contentId" from-field="forumGroupId"/>
                 </entity-one>
                 <set field="objectName" from-field="forumGroup.contentName"/>
                 <set field="objectId"  from-field="forumGroup.contentId"/>
                 <entity-and entity-name="ContentAssocDataResourceViewTo" list-name="forums">
-                    <field-map field-name="contentIdStart" env-name="forumGroupId"/>
+                    <field-map field-name="contentIdStart" from-field="forumGroupId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -117,12 +117,12 @@
                 <set field="tabButtonItem" value="roles"/>
                 <set field="tabBar" value="ForumGroupTabBar"/>
                 <entity-one entity-name="Content" value-field="forumGroup">
-                    <field-map field-name="contentId" env-name="parameters.forumGroupId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumGroupId"/>
                 </entity-one>
                 <set field="objectName" from-field="forumGroup.contentName"/>
                 <set field="objectId"  from-field="forumGroup.contentId"/>
                 <entity-and entity-name="ContentRole" list-name="forumRoles">
-                    <field-map field-name="contentId" env-name="parameters.forumGroupId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumGroupId"/>
                     <order-by field-name="roleTypeId"/>
                 </entity-and>
             </actions>
@@ -146,12 +146,12 @@
                 <set field="tabButtonItem" value="purposes"/>
                 <set field="tabBar" value="ForumGroupTabBar"/>
                 <entity-one entity-name="Content" value-field="forumGroup">
-                    <field-map field-name="contentId" env-name="parameters.forumGroupId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumGroupId"/>
                 </entity-one>
                 <set field="objectName" from-field="forumGroup.contentName"/>
                 <set field="objectId"  from-field="forumGroup.contentId"/>
                 <entity-and entity-name="ContentPurpose" list-name="forumPurposes">
-                    <field-map field-name="contentId" env-name="parameters.forumGroupId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumGroupId"/>
                     <order-by field-name="contentPurposeTypeId"/>
                 </entity-and>
             </actions>
@@ -177,13 +177,13 @@
                 <set field="tabButtonItem" value="messageList"/>
                 <set field="labelTitleProperty" value="PageTitleFindForumMessages"/>
                 <entity-one entity-name="Content" value-field="forum">
-                    <field-map field-name="contentId" env-name="parameters.forumId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumId"/>
                 </entity-one>
                 <set field="objectName" from-field="forum.contentName"/>
                 <set field="objectId"  from-field="forum.contentId"/>
                 <set field="forumNbrMessages" from-field="forum.childBranchCount" default-value="0"/>
                 <entity-and entity-name="ContentAssocViewTo" list-name="forumMessages">
-                    <field-map field-name="ownerContentId" env-name="parameters.forumId"/>
+                    <field-map field-name="ownerContentId" from-field="parameters.forumId"/>
                     <order-by field-name="createdDate DESC"/>
                 </entity-and>
                 <set field="parameters.forumMessageIdTo" from-field="parameters.forumId"/>
@@ -216,7 +216,7 @@
                 <set field="threadContentId" from-field="parameters.threadContentId" default-value="${contentId}" />
                 <set field="forumId" from-field="parameters.forumId" />
                 <entity-one entity-name="Content" value-field="content" use-cache="true">
-                    <field-map field-name="contentId" env-name="contentId"/>
+                    <field-map field-name="contentId" from-field="contentId"/>
                 </entity-one>
                 <set field="ownerContentId" from-field="content.ownerContentId" default-value="${forumId}" />
                 <set field="trail" from-field="threadContentId" />
@@ -229,19 +229,19 @@
                 <set field="tabButtonItem" value="messageThread"/>
                 <set field="labelTitleProperty" value="PageTitleFindForumMessages"/>
                 <entity-one entity-name="Content" value-field="forum">
-                    <field-map field-name="contentId" env-name="parameters.forumId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumId"/>
                 </entity-one>
                 <set field="objectName" from-field="forum.contentName"/>
                 <set field="objectId"  from-field="forum.contentId"/>
                 <set field="forumNbrMessages" from-field="forum.childBranchCount" default-value="0"/>
                 <entity-one entity-name="Content" value-field="forumThread">
-                    <field-map field-name="contentId" env-name="parameters.forumThreadId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumThreadId"/>
                 </entity-one>
                 <entity-one entity-name="Content" value-field="forumMessage">
-                    <field-map field-name="contentId" env-name="parameters.forumMessageId"/>
+                    <field-map field-name="contentId" from-field="parameters.forumMessageId"/>
                 </entity-one>
                 <entity-one entity-name="ElectronicText" value-field="electronicText">
-                    <field-map field-name="dataResourceId" env-name="forumMessage.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="forumMessage.dataResourceId"/>
                 </entity-one>
                 <set field="contentId" from-field="parameters.forumId"/>
                 <set field="trail" from-field="parameters.trail" default-value="${contentId}"/>
@@ -341,7 +341,7 @@
                 <set field="tabButtonItem" value=""/>
                 <set field="labelTitleProperty" value="PageTitleFindForumMessages"/>
                 <entity-one entity-name="Content" value-field="forumMessage">
-                    <field-map field-name="contentId" env-name="parameters.forumMessageIdTo"/>
+                    <field-map field-name="contentId" from-field="parameters.forumMessageIdTo"/>
                 </entity-one>
             </actions>
             <widgets>
@@ -377,7 +377,7 @@
                 <set field="tabButtonItem" value=""/>
                 <set field="labelTitleProperty" value="PageTitleFindForumMessages"/>
                 <entity-one entity-name="Content" value-field="forumMessage">
-                    <field-map field-name="contentId" env-name="parameters.forumMessageIdTo"/>
+                    <field-map field-name="contentId" from-field="parameters.forumMessageIdTo"/>
                 </entity-one>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml Sun Feb  1 13:54:08 2009
@@ -26,7 +26,7 @@
     <tree name="MessageTree" root-node-name="node-root" default-render-style="simple">
         <node name="node-root">
             <entity-one entity-name="Content" use-cache="false" value-field="rsp">
-                <field-map field-name="contentId" env-name="parameters.forumId"/>
+                <field-map field-name="contentId" from-field="parameters.forumId"/>
             </entity-one>
             <!--include-screen name="responseTreeLine" location="component://content/widget/forum/ForumScreens.xml" /-->
             <sub-node node-name="node-body">

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sun Feb  1 13:54:08 2009
@@ -115,8 +115,8 @@
         odd-row-style="alternate-row" default-table-style="basic-table">
         <actions>
             <set field="parameters.noConditionFind" value="Y"/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductFeatureType"/>
                 <field-map field-name="orderBy" value="productFeatureTypeId"/>
             </service>
@@ -160,8 +160,8 @@
         odd-row-style="alternate-row" default-table-style="basic-table">
         <actions>
             <set field="parameters.noConditionFind" value="Y"/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductFeatureIactn"/>
                 <field-map field-name="orderBy" value="productFeatureId"/>
                 </service>
@@ -277,8 +277,8 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
         <actions>
             <set field="parameters.noConditionFind" value="Y"/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductFeatureCategory"/>
                 <field-map field-name="orderBy" value="productFeatureCategoryId"/>
             </service>
@@ -305,7 +305,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table">
         <actions>
             <entity-and entity-name="ProductFeaturePrice" list-name="productFeaturePrice">
-                <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/>
+                <field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
             </entity-and>
         </actions>
         <field name="productFeatureId"><hidden/></field>

Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Sun Feb  1 13:54:08 2009
@@ -47,8 +47,8 @@
     <form name="listLookupProduct" list-name="listIt" title="" type="list" paginate-target="LookupProduct"
         odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Product"/>
             </service>
         </actions>
@@ -70,8 +70,8 @@
     <form name="listLookupVirtualProduct" list-name="listIt" title="" type="list" extends="listLookupProduct"
         paginate-target="LookupVirtualProduct" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Product"/>
             </service>
         </actions>
@@ -132,8 +132,8 @@
     <form name="listLookupProductAndPrice" list-name="listIt" title="" type="list"
         paginate-target="LookupProductAndPrice" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductAndPriceView"/>
             </service>
         </actions>
@@ -197,8 +197,8 @@
     <form name="listLookupProductCategory" list-name="listIt" title="" type="list"
         paginate-target="LookupProductCategory" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductCategory"/>
             </service>
         </actions>
@@ -238,8 +238,8 @@
     <form name="listLookupProductFeature" list-name="listIt" title="" type="list" paginate-target="LookupProductFeature"
         odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductFeature"/>
             </service>
         </actions>
@@ -264,8 +264,8 @@
     <form name="listLookupProductStore" list-name="listIt" target="" title="" type="list"
         paginate-target="LookupProductStore" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductStore"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml Sun Feb  1 13:54:08 2009
@@ -26,8 +26,8 @@
             <set field="noConditionFind" value="Y"/>
             <set field="parameters.productPriceRuleId" value=""/>
             <set field="parameters.ruleName" value=""/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">      
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">      
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="ProductPriceRule"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sun Feb  1 13:54:08 2009
@@ -23,8 +23,8 @@
     <form name="FindFacility" type="list" list-name="listIt" paginate-target="FindFacility"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Facility"/>
             </service>
         </actions>
@@ -83,8 +83,8 @@
     <form name="ListFacilityInventoryItems" type="list" list-name="listIt" header-row-style="header-row-2"
         paginate-target="EditFacilityInventoryItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="InventoryItemAndLocation"/>
                 <field-map field-name="orderBy" value="statusId|quantityOnHandTotal|serialNumber"/>
             </service>
@@ -187,8 +187,8 @@
     <form name="ListFacilityInventoryItemsDetailsByItem" type="list" target="" title="" list-name="listIt"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="InventoryItemAndDetail"/>
                 <field-map field-name="orderBy" value="productId|inventoryItemId|-inventoryItemDetailSeqId|-effectiveDate|quantityOnHandTotal"/>
             </service>
@@ -238,8 +238,8 @@
     <form name="ListFacilityInventoryItemsDetailsByProduct" type="list" target="" title="" list-name="listIt"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="InventoryItemAndDetail"/>
                 <field-map field-name="orderBy" value="productId|-effectiveDate|inventoryItemId|-inventoryItemDetailSeqId|quantityOnHandTotal"/>
             </service>
@@ -281,8 +281,8 @@
     <form name="ListFacilityInventoryItemsDetailsByDate" type="list" target="" title="" list-name="listIt"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="results" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="InventoryItemAndDetail"/>
                 <field-map field-name="orderBy" value="-effectiveDate|productId|inventoryItemId|-inventoryItemDetailSeqId|quantityOnHandTotal"/>
             </service>
@@ -371,12 +371,12 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"
         paginate-target="${facilityInventoryByProductScreen}" override-list-size="${overrideListSize}">
         <row-actions>
-            <service service-name="getProductInventoryAndFacilitySummary" result-map-name="resultMap">
-                <field-map field-name="minimumStock" env-name="minimumStock"/>
-                <field-map field-name="productId" env-name="productId"/>
-                <field-map field-name="facilityId" env-name="facilityId"/>
-                <field-map field-name="checkTime" env-name="checkTime"/>
-                <field-map field-name="statusId" env-name="statusId"/>
+            <service service-name="getProductInventoryAndFacilitySummary" result-map="resultMap">
+                <field-map field-name="minimumStock" from-field="minimumStock"/>
+                <field-map field-name="productId" from-field="productId"/>
+                <field-map field-name="facilityId" from-field="facilityId"/>
+                <field-map field-name="checkTime" from-field="checkTime"/>
+                <field-map field-name="statusId" from-field="statusId"/>
             </service>
         </row-actions>
         <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
@@ -637,7 +637,7 @@
                 <field-map field-name="inventoryItemId"/>
             </entity-one>
             <entity-one entity-name="Product" value-field="product">
-                <field-map field-name="productId" env-name="inventoryItem.productId"/>
+                <field-map field-name="productId" from-field="inventoryItem.productId"/>
             </entity-one>
         </row-actions>
 
@@ -674,7 +674,7 @@
                 <field-map field-name="inventoryItemId"/>
             </entity-one>
             <entity-one entity-name="Product" value-field="product">
-                <field-map field-name="productId" env-name="inventoryItem.productId"/>
+                <field-map field-name="productId" from-field="inventoryItem.productId"/>
             </entity-one>
         </row-actions>
         <field name="inventoryTransferId" widget-style="buttontext">
@@ -711,7 +711,7 @@
                 <field-map field-name="inventoryItemId"/>
             </entity-one>
             <entity-one entity-name="Product" value-field="product">
-                <field-map field-name="productId" env-name="inventoryItem.productId"/>
+                <field-map field-name="productId" from-field="inventoryItem.productId"/>
             </entity-one>
         </row-actions>
         <field name="inventoryTransferId" widget-style="buttontext">

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sun Feb  1 13:54:08 2009
@@ -29,8 +29,8 @@
             <set field="locationSeqId" from-field="inventoryItem.locationSeqId"/>
             <set field="statusId" from-field="inventoryItem.statusId"/>
             <entity-one entity-name="FacilityLocation" value-field="facilityLocation">
-                <field-map field-name="locationSeqId" env-name="locationSeqId"/>
-                <field-map field-name="facilityId" env-name="facilityId"/>                
+                <field-map field-name="locationSeqId" from-field="locationSeqId"/>
+                <field-map field-name="facilityId" from-field="facilityId"/>                
             </entity-one>
         </actions>
         <alt-target use-when="inventoryItemId==null" target="CreateInventoryItem"/>

Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml Sun Feb  1 13:54:08 2009
@@ -40,8 +40,8 @@
     <form name="listLookupFacility" list-name="listIt" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupFacility">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Facility"/>
             </service>
         </actions>
@@ -76,8 +76,8 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
         paginate-target="LookupFacilityLocation">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="FacilityLocation"/>
             </service>
         </actions>
@@ -116,8 +116,8 @@
     <form name="listShipment" list-name="listIt" title="" type="list" paginate-target="LookupShipment"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
+            <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Shipment"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Sun Feb  1 13:54:08 2009
@@ -176,7 +176,7 @@
                 <entity-one entity-name="ProductCategoryContent" value-field="categoryContent"/>
                 <entity-one entity-name="Content" value-field="content"/>
                 <entity-one entity-name="ElectronicText" value-field="electronicText" auto-field-map="false">
-                    <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+                    <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
                 </entity-one>
                 <set field="textDataMap.text" from-field="electronicText.textData"/>
                 <set field="textDataMap.textDataResourceId" from-field="content.dataResourceId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sun Feb  1 13:54:08 2009
@@ -62,7 +62,7 @@
                 <set field="headerItem" value="featurecats"/>
                 <entity-one entity-name="ProductFeature" value-field="productFeature" auto-field-map="true"/>
                 <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures">
-                    <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/>
+                    <field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -536,7 +536,7 @@
                 <set field="headerItem" value="featurecats"/>
                 <entity-one entity-name="ProductFeature" value-field="productFeature" auto-field-map="true"/>
                 <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures">
-                    <field-map field-name="productFeatureId" env-name="parameters.productFeatureId"/>
+                    <field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
                 </entity-and>
             </actions>
             <widgets>