svn commit: r739732 [3/3] - in /ofbiz/trunk: applications/content/widget/ applications/content/widget/cms/ applications/content/widget/compdoc/ applications/content/widget/content/ applications/content/widget/forum/ applications/content/widget/layout/ ...

Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Sun Feb  1 10:27:43 2009
@@ -73,7 +73,7 @@
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 
                 <set field="productId" from-field="parameters.productId"/>                
-                <entity-one entity-name="Product" value-name="product"/>
+                <entity-one entity-name="Product" value-field="product"/>
                 <set field="productName" from-field="product.productName"/>                
             </actions>
             <widgets>
@@ -201,7 +201,7 @@
                 <set field="labelTitleProperty" value="ProductProduct"/>
     
                 <set field="productId" from-field="parameters.productId"/>
-                <entity-one entity-name="Product" value-name="product"/>
+                <entity-one entity-name="Product" value-field="product"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Sun Feb  1 10:27:43 2009
@@ -43,7 +43,7 @@
         <section>
             <actions>
                 <set field="facilityId" from-field="parameters.facilityId"/>
-                <entity-one entity-name="Facility" value-name="parameters.facility"/>
+                <entity-one entity-name="Facility" value-field="parameters.facility"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonDecorator">
@@ -151,7 +151,7 @@
         <section>
             <actions>
                 <set field="productId" from-field="parameters.productId"/>
-                <entity-one entity-name="Product" value-name="product"/>
+                <entity-one entity-name="Product" value-field="product"/>
                 <set field="focusField" value="productLocation"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Feb  1 10:27:43 2009
@@ -71,9 +71,9 @@
                 <set field="headerItem" value="viewprofile"/>
                 <set field="partyId" from-field="userLogin.partyId"/>
                 <set field="parameters.partyId" from-field="userLogin.partyId"/>
-                <entity-one entity-name="Party" value-name="party"/>
-                <entity-one entity-name="Person" value-name="lookupPerson"/>
-                <entity-one entity-name="PartyGroup" value-name="lookupGroup"/>
+                <entity-one entity-name="Party" value-field="party"/>
+                <entity-one entity-name="Person" value-field="lookupPerson"/>
+                <entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -114,7 +114,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="${parameters.donePage}"/>
-                <entity-one entity-name="CommunicationEvent" value-name="commEvent">
+                <entity-one entity-name="CommunicationEvent" value-field="commEvent">
                     <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
                 </entity-one>
                 <script location="component://mypage/webapp/mypage/WEB-INF/actions/GetMyCommunicationEventRole.groovy"/>
@@ -482,7 +482,7 @@
         <section>
             <actions>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Feb  1 10:27:43 2009
@@ -226,7 +226,7 @@
                     </condition-list>
                     <order-by field-name="-datetimeStarted" />
                 </entity-condition>
-                <entity-one entity-name="PartyNameView" value-name="partyName">
+                <entity-one entity-name="PartyNameView" value-field="partyName">
                     <field-map field-name="partyId" env-name="partyId"/>
                 </entity-one>
             </actions>
@@ -299,7 +299,7 @@
                 <set field="titleProperty" value="PageTitleViewCommunication" />
                 <set field="tabButtonItem" value="OverView" />
                 <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
-                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+                <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
                 <set field="headerItem" value="donePage" />
             </actions>
             <widgets>
@@ -402,7 +402,7 @@
                 <set field="titleProperty" value="PageTitleViewRequest"/>
                 <set field="showRequestManagementLinks" value="Y"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <get-related-one value-name="custRequest" relation-name="CustRequestType" to-value-name="custRequestType"/>
                 <get-related-one value-name="custRequest" relation-name="StatusItem" to-value-name="statusItem"/>
                 <get-related-one value-name="custRequest" relation-name="CurrencyUom" to-value-name="currency"/>
@@ -465,10 +465,10 @@
                 <set field="headerItem" value="request"/>
                 
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 
                 <set field="statusId" from-field="custRequest.statusId"/>
-                <entity-one entity-name="StatusItem" value-name="currentStatus"/>
+                <entity-one entity-name="StatusItem" value-field="currentStatus"/>
             </actions>
             <widgets>
                 <section>
@@ -540,7 +540,7 @@
             <actions>
                 <set field="titleProperty" value="PageTitleEditCommunication" />
                 <set field="tabButtonItem" value="CommunicationEvent" />
-                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+                <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/>
             </actions>
@@ -749,8 +749,8 @@
                 <set field="tabButtonItem" value="custRequestContent"/>
                 <set field="headerItem" value="request"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="Content" value-name="content"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="Content" value-field="content"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true">
                     <field-map field-name="custRequestId" env-name="custRequestId"/>
                 </entity-and>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sun Feb  1 10:27:43 2009
@@ -50,7 +50,7 @@
                 <set field="parameters.parentPortalPageId" value="MYPORTAL" global="true"/>
                 <set field="parameters.userLogin.userLoginId" from-field="userLogin.userLoginId"/>
                 <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/>
-                <entity-one entity-name="PartyNameView" value-name="partyNameView">
+                <entity-one entity-name="PartyNameView" value-field="partyNameView">
                     <field-map field-name="partyId" env-name="userLogin.partyId"/>
                 </entity-one>
                 <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
@@ -67,9 +67,9 @@
                 <set field="headerItem" value="viewprofile"/>
                 <set field="partyId" from-field="userLogin.partyId"/>
                 <set field="parameters.partyId" from-field="userLogin.partyId"/>
-                <entity-one entity-name="Party" value-name="party"/>
-                <entity-one entity-name="Person" value-name="lookupPerson"/>
-                <entity-one entity-name="PartyGroup" value-name="lookupGroup"/>
+                <entity-one entity-name="Party" value-field="party"/>
+                <entity-one entity-name="Person" value-field="lookupPerson"/>
+                <entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -111,7 +111,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="${parameters.portalPageId}"/>
-                <entity-one entity-name="CommunicationEvent" value-name="commEvent">
+                <entity-one entity-name="CommunicationEvent" value-field="commEvent">
                     <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/>
                 </entity-one>
                 <script location="component://myportal/webapp/myportal/WEB-INF/actions/GetMyCommunicationEventRole.groovy"/>
@@ -196,7 +196,7 @@
         <section>
             <actions>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <entity-one entity-name="PartyAndPerson" value-name="personInfo"/>
+                <entity-one entity-name="PartyAndPerson" value-field="personInfo"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -244,7 +244,7 @@
         <section>
             <actions>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Feb  1 10:27:43 2009
@@ -227,7 +227,7 @@
                     </condition-list>
                     <order-by field-name="-datetimeStarted" />
                 </entity-condition>
-                <entity-one entity-name="PartyNameView" value-name="partyName">
+                <entity-one entity-name="PartyNameView" value-field="partyName">
                     <field-map field-name="partyId" env-name="partyId"/>
                 </entity-one>
             </actions>
@@ -300,7 +300,7 @@
                 <set field="titleProperty" value="PageTitleViewCommunication" />
                 <set field="tabButtonItem" value="OverView" />
                 <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
-                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+                <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
                 <set field="headerItem" from-field="parameters.portalPageId" />
             </actions>
             <widgets>
@@ -403,7 +403,7 @@
                 <set field="titleProperty" value="PageTitleViewRequest"/>
                 <set field="showRequestManagementLinks" value="Y"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <get-related-one value-name="custRequest" relation-name="CustRequestType" to-value-name="custRequestType"/>
                 <get-related-one value-name="custRequest" relation-name="StatusItem" to-value-name="statusItem"/>
                 <get-related-one value-name="custRequest" relation-name="CurrencyUom" to-value-name="currency"/>
@@ -466,10 +466,10 @@
                 <set field="headerItem" value="request"/>
                 
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 
                 <set field="statusId" from-field="custRequest.statusId"/>
-                <entity-one entity-name="StatusItem" value-name="currentStatus"/>
+                <entity-one entity-name="StatusItem" value-field="currentStatus"/>
             </actions>
             <widgets>
                 <section>
@@ -539,7 +539,7 @@
                 <set field="tabButtonItem" value="CommunicationEvent" />
                 <set field="portalPageId" from-field="parameters.portalPageId" default-value="parameters.portalPageId"/>
                 <set field="headerItem" from-field="parameters.portalPageId"/>
-                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" />
+                <entity-one entity-name="CommunicationEvent" value-field="communicationEvent" />
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventReply.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/PrepCommEventForward.groovy"/>
             </actions>
@@ -744,8 +744,8 @@
                 <set field="tabButtonItem" value="custRequestContent"/>
                 <set field="headerItem" value="request"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="Content" value-name="content"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="Content" value-field="content"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <entity-and entity-name="CustRequestContent" list-name="custRequestContents" filter-by-date="true">
                     <field-map field-name="custRequestId" env-name="custRequestId"/>
                 </entity-and>

Modified: ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml Sun Feb  1 10:27:43 2009
@@ -76,7 +76,7 @@
                 <set field="component" from-field="parameters.component"/>
                 <set field="task" from-field="parameters.task"/>
                 <set field="referenceId" from-field="parameters.referenceId"/>
-                <entity-one entity-name="OagisMessageInfo" value-name="oagisMessageInfo"/>
+                <entity-one entity-name="OagisMessageInfo" value-field="oagisMessageInfo"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}">
@@ -158,7 +158,7 @@
                 <set field="task" from-field="parameters.task"/>
                 <set field="referenceId" from-field="parameters.referenceId"/>
                 <set field="errorSeqId" from-field="parameters.errorSeqId"/>
-                <entity-one entity-name="OagisMessageErrorInfo" value-name="oagisMessageErrorInfo"/>
+                <entity-one entity-name="OagisMessageErrorInfo" value-field="oagisMessageErrorInfo"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sun Feb  1 10:27:43 2009
@@ -55,7 +55,7 @@
             <actions>
                 <set field="headerItem" value="projects"/>                
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-                <entity-one entity-name="WorkEffort" value-name="project">
+                <entity-one entity-name="WorkEffort" value-field="project">
                     <field-map field-name="workEffortId" env-name="projectId"/>
                 </entity-one>
             </actions>
@@ -95,7 +95,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="task"/>
-                <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+                <entity-one entity-name="WorkEffort" value-field="workEffort"/>
                 <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
                     <field-map field-name="taskId" env-name="parameters.workEffortId"/>
                 </service>
@@ -159,7 +159,7 @@
         <section>
             <actions>                
                 <set field="skillTypeId" from-field="parameters.skillTypeId"/>
-                <entity-one entity-name="SkillType" value-name="skillType"/>
+                <entity-one entity-name="SkillType" value-field="skillType"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -186,8 +186,8 @@
             <actions>
                 <set field="headerItem" value="timesheet"/>
                 <set field="timesheetId" from-field="parameters.timesheetId"/>
-                <entity-one entity-name="Timesheet" value-name="timesheet"/>
-                <entity-one entity-name="PartyNameView" value-name="partyName">
+                <entity-one entity-name="Timesheet" value-field="timesheet"/>
+                <entity-one entity-name="PartyNameView" value-field="partyName">
                     <field-map field-name="partyId" env-name="timesheet.partyId"/>
                 </entity-one>
             </actions>
@@ -308,11 +308,11 @@
             <actions>
                 <set field="headerItem" value="resources"/>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <entity-one entity-name="Party" value-name="party"/>
-                <entity-one entity-name="Person" value-name="lookupPerson"/>
-                <entity-one entity-name="PartyGroup" value-name="lookupGroup"/>
+                <entity-one entity-name="Party" value-field="party"/>
+                <entity-one entity-name="Person" value-field="lookupPerson"/>
+                <entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
                 <set field="communicationEventId" from-field="parameters.communicationEventId"/>
-                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+                <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
                 <set field="okayToUpdate" value="true" type="Boolean" global="true"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sun Feb  1 10:27:43 2009
@@ -153,7 +153,7 @@
             <actions>
                 <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/>
                 <set field="tabButtonItem" value="treeDetails"/>
-                <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+                <entity-one entity-name="WorkEffort" value-field="workEffort"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/>                
             </actions>
             <widgets>
@@ -182,8 +182,8 @@
                 <set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/>
                 <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>
-                <entity-one entity-name="WorkEffort" value-name="project"/>
-                <entity-one entity-name="WorkEffortAssoc" value-name="workEffortAssoc"/>
+                <entity-one entity-name="WorkEffort" value-field="project"/>
+                <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -286,7 +286,7 @@
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <set field="workEffortAssocTypeId" from-field="parameters.workEffortAssocTypeId"/>
                 <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/>
-                <entity-one entity-name="WorkEffort" value-name="task"/>
+                <entity-one entity-name="WorkEffort" value-field="task"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -365,7 +365,7 @@
                 <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
                 <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <set field="projectId" from-field="workEffortId"/>
-                <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
+                <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
             </actions>            
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -453,7 +453,7 @@
                 <set field="labelTitleProperty" value="PageTitleListProjectNotes"/>
                 <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <set field="noteId" from-field="parameters.noteId"/>
-                <entity-one entity-name="WorkEffortNoteAndData" value-name="workEffortNoteAndData"/>
+                <entity-one entity-name="WorkEffortNoteAndData" value-field="workEffortNoteAndData"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
@@ -677,7 +677,7 @@
                 <set field="project" from-field="result.projectInfo"/>
                 <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <set field="projectId" from-field="workEffortId"/>
-                <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
+                <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
             </actions>
             <widgets>              
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -730,7 +730,7 @@
                 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <entity-one entity-name="PartyAndPerson" value-name="person"/>
+                <entity-one entity-name="PartyAndPerson" value-field="person"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -825,9 +825,9 @@
                 <set field="contactMechIdTo" from-field="parameters.contactMechIdTo"/>
                 <set field="contactMechTypeId" from-field="parameters.contactMechTypeId"/>
                 
-                <entity-one entity-name="Party" use-cache="true" value-name="party"/>
-                <entity-one entity-name="Person" use-cache="true" value-name="lookupPerson"/>
-                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+                <entity-one entity-name="Party" use-cache="true" value-field="party"/>
+                <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson"/>
+                <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy"/>
             </actions>
             <widgets>
@@ -978,7 +978,7 @@
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="userLoginId" from-field="parameters.userLoginId"/>
-                <entity-one entity-name="UserLogin" value-name="editUserLogin"/>
+                <entity-one entity-name="UserLogin" value-field="editUserLogin"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1001,7 +1001,7 @@
                 <set field="labelTitleProperty" value="PageTitleEditUserLoginSecurityGroups"/>
                 
                 <set field="userLoginId" from-field="parameters.userLoginId"/>
-                <entity-one entity-name="UserLogin" value-name="editUserLogin"/>
+                <entity-one entity-name="UserLogin" value-field="editUserLogin"/>
                 <set field="partyId" from-field="parameters.partyId" default-value="${editUserLogin.partyId}"/>
             </actions>
             <widgets>
@@ -1027,7 +1027,7 @@
                 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <entity-one entity-name="PartyAndGroup" value-name="partyGroup"/>
+                <entity-one entity-name="PartyAndGroup" value-field="partyGroup"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1046,7 +1046,7 @@
                 <set field="tabButtonItem" value="projectContent"/>
                 <set field="headerItem" value="EditProjectContents"/>
                 <set field="contentId" from-field="parameters.contentId"/>
-                <entity-one entity-name="Content" value-name="content"/>
+                <entity-one entity-name="Content" value-field="content"/>
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <entity-and entity-name="WorkEffortAndContentDataResource" list-name="workEffortAndContentDataResources">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Sun Feb  1 10:27:43 2009
@@ -54,10 +54,10 @@
                 <set field="headerItem" value="request"/>
                 
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 
                 <set field="statusId" from-field="custRequest.statusId"/>
-                <entity-one entity-name="StatusItem" value-name="currentStatus"/>
+                <entity-one entity-name="StatusItem" value-field="currentStatus"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
@@ -80,7 +80,7 @@
                 <!--<set field="headerItem" value="Shopping List"/>-->
                 <set field="showRequestManagementLinks" value="Y"/>
                 <set field="custRequestId" from-field="parameters.custRequestId"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
                 <get-related-one value-name="custRequest" relation-name="CustRequestType" to-value-name="custRequestType"/>
                 <get-related-one value-name="custRequest" relation-name="StatusItem" to-value-name="statusItem"/>
                 <get-related-one value-name="custRequest" relation-name="CurrencyUom" to-value-name="currency"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sun Feb  1 10:27:43 2009
@@ -82,7 +82,7 @@
                     <field-map field-name="partyId" env-name="userLogin.partyId"/>
                     <field-map field-name="workEffortTypeId" value="PROJECT"/>
                 </entity-and>
-                <entity-one entity-name="WorkEffort" value-name="task">
+                <entity-one entity-name="WorkEffort" value-field="task">
                     <field-map field-name="workEffortId" value="dummy"/>
                 </entity-one>
                 <set field="myTask" value="notNull"/>
@@ -198,7 +198,7 @@
                 <set field="tabButtonItem" value="edittask"/>                
                 <set field="labelTitleProperty" value="PageTitleEditTaskList"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>                
-                <entity-one entity-name="WorkEffort" value-name="task"/>    
+                <entity-one entity-name="WorkEffort" value-field="task"/>    
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.bsh"/>
             </actions>
             <widgets>
@@ -227,8 +227,8 @@
                 <set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/>
                 <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>
-                <entity-one entity-name="WorkEffort" value-name="task"/>
-                <entity-one entity-name="WorkEffortAssoc" value-name="workEffortAssoc"/>
+                <entity-one entity-name="WorkEffort" value-field="task"/>
+                <entity-one entity-name="WorkEffortAssoc" value-field="workEffortAssoc"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -312,7 +312,7 @@
                 <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/>
                 <set field="headerItem" value="task"/>
                 <set field="tabButtonItem" value="treeDetails"/>
-                <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+                <entity-one entity-name="WorkEffort" value-field="workEffort"/>
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/>                
             </actions>
             <widgets>
@@ -338,7 +338,7 @@
                 <set field="tabButtonItem" value="parties"/>
                 <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
+                <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/>
                 <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString(&quot;yyyy-MM-dd HH:mm:ss.S&quot;)}" type="String"/>
                 <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
                     <field-map field-name="taskId" env-name="parameters.workEffortId"/>
@@ -560,8 +560,8 @@
                 <set field="headerItem" value="request"/>
                 <set field="tabButtonItem" value="edittask"/>                
                 <set field="labelTitleProperty" value="PageTitleEditTask"/>
-                <entity-one entity-name="CustRequest" value-name="custRequest"/>
-                <entity-one entity-name="PartyNameView" value-name="partyName">
+                <entity-one entity-name="CustRequest" value-field="custRequest"/>
+                <entity-one entity-name="PartyNameView" value-field="partyName">
                     <field-map field-name="partyId" env-name="custRequest.fromPartyId"/>
                 </entity-one>
                 </actions>
@@ -592,7 +592,7 @@
                 <set field="tabButtonItem" value="taskContent"/>
                 <set field="headerItem" value="EditTaskContents"/>
                 <set field="contentId" from-field="parameters.contentId"/>
-                <entity-one entity-name="Content" value-name="content"/>
+                <entity-one entity-name="Content" value-field="content"/>
                 <set field="workEffortId" from-field="parameters.workEffortId" default-value="${parameters.workEffortId}"/>
                 <entity-and entity-name="WorkEffortAndContentDataResource" list-name="workEffortAndContentDataResources">
                     <field-map field-name="workEffortId" env-name="workEffortId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sun Feb  1 10:27:43 2009
@@ -104,7 +104,7 @@
                 <set field="headerItem" value="timesheet"/>
                 <set field="tabButtonItem" value="edittimesheet"/>
                 <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
-                <entity-one entity-name="Timesheet" value-name="timesheet"/>
+                <entity-one entity-name="Timesheet" value-field="timesheet"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -132,7 +132,7 @@
                 <set field="headerItem" value="timesheet"/>
                 <set field="tabButtonItem" value="addtimesheet"/>
                 <set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
-                <entity-one entity-name="Timesheet" value-name="timesheet"/>
+                <entity-one entity-name="Timesheet" value-field="timesheet"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -182,7 +182,7 @@
                 <set field="labelTitleProperty" value="PageTitleEditTimesheetEntries"/>
                 
                 <set field="timesheetId" from-field="parameters.timesheetId"/>
-                <entity-one entity-name="Timesheet" value-name="timesheet"/>
+                <entity-one entity-name="Timesheet" value-field="timesheet"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -213,7 +213,7 @@
                 <set field="labelTitleProperty" value="PageTitleEditTimesheetRoles"/>
                 
                 <set field="timesheetId" from-field="parameters.timesheetId"/>
-                <entity-one entity-name="Timesheet" value-name="timesheet"/>
+                <entity-one entity-name="Timesheet" value-field="timesheet"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
@@ -272,7 +272,7 @@
     <screen name="ListTimesheets">
         <section>
             <actions>
-                <entity-one entity-name="PartyNameView" value-name="partyNameView">
+                <entity-one entity-name="PartyNameView" value-field="partyNameView">
                     <field-map field-name="partyId" env-name="timesheet.partyId"/>
                 </entity-one>
             </actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml Sun Feb  1 10:27:43 2009
@@ -23,7 +23,7 @@
     <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort"
         default-render-style="simple" default-wrap-style="treeWrapper">
         <node name="node-root"  entity-name="WorkEffort" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+            <entity-one entity-name="WorkEffort" value-field="workEffort"/>
             <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/>
             <sub-node node-name="node-list">
                 <entity-condition entity-name="WorkEffortAssoc">
@@ -32,7 +32,7 @@
             </sub-node>
         </node>
         <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort">
+            <entity-one entity-name="WorkEffort" value-field="workEffort">
                 <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
             </entity-one>
             <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/>
@@ -46,7 +46,7 @@
     <tree name="TreeTaskWorkEffort" root-node-name="node-root" entity-name="WorkEffort"
         default-render-style="simple" default-wrap-style="treeWrapper">
         <node name="node-root"  entity-name="WorkEffort" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+            <entity-one entity-name="WorkEffort" value-field="workEffort"/>
             <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/>
             <sub-node node-name="node-list">
                 <entity-condition entity-name="WorkEffortAssoc">
@@ -55,7 +55,7 @@
             </sub-node>
         </node>
         <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
-            <entity-one entity-name="WorkEffort" value-name="workEffort">
+            <entity-one entity-name="WorkEffort" value-field="workEffort">
                 <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
             </entity-one>
             <include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Feb  1 10:27:43 2009
@@ -22,7 +22,7 @@
     <form name="EditProject" type="single" target="updateProject" default-map-name="project"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <entity-one entity-name="PartyGroup" value-name="partyGroup">
+            <entity-one entity-name="PartyGroup" value-field="partyGroup">
                 <field-map field-name="partyId" env-name="partyId"/>
             </entity-one>
         </actions>
@@ -203,7 +203,7 @@
     <form name="ListChildEfforts"  target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
-            <entity-one entity-name="StatusItem" value-name="currentStatus">
+            <entity-one entity-name="StatusItem" value-field="currentStatus">
                 <field-map field-name="statusId" env-name="currentStatusId"/>
             </entity-one>
         </row-actions>
@@ -273,7 +273,7 @@
     <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
-            <entity-one entity-name="StatusItem" value-name="currentStatus">
+            <entity-one entity-name="StatusItem" value-field="currentStatus">
                 <field-map field-name="statusId" env-name="currentStatusId"/>
             </entity-one>
         </row-actions>
@@ -384,8 +384,8 @@
     <form name="ListProjectCompanyParties" type="list" list-name="companyAssigns"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
-            <entity-one entity-name="PartyAcctgPreference" value-name="orgParty"/>
-            <entity-one entity-name="Party" value-name="clientParty"/>
+            <entity-one entity-name="PartyAcctgPreference" value-field="orgParty"/>
+            <entity-one entity-name="Party" value-field="clientParty"/>
             <set field="currencyUomId" value="${bsh:orgParty!=null&amp;&amp;orgParty.getString(&quot;baseCurrencyUomId&quot;)!=null?orgParty.getString(&quot;baseCurrencyUomId&quot;):&quot;&quot;}"/>
             <set field="currencyUomId" value="${bsh:clientParty!=null&amp;&amp;clientParty.getString(&quot;preferredCurrencyUomId&quot;)!=null?clientParty.getString(&quot;preferredCurrencyUomId&quot;):currencyUomId}"/>
         </row-actions>
@@ -681,10 +681,10 @@
         <actions>
             <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
             <set field="workEffortId" from-field="parameters.workEffortId"/>
-            <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+            <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false">
                 <field-map field-name="statusId" env-name="content.statusId"/>
             </entity-one>
-            <entity-one entity-name="DataResource" value-name="dataResource" auto-field-map="false">
+            <entity-one entity-name="DataResource" value-field="dataResource" auto-field-map="false">
                 <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
             </entity-one>
         </actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=739732&r1=739731&r2=739732&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Sun Feb  1 10:27:43 2009
@@ -92,7 +92,7 @@
     <form name="RequestInfo" type="single" default-entity-name="CustRequest" default-map-name="custRequest"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <entity-one entity-name="WorkEffort" value-name="workEffort">
+            <entity-one entity-name="WorkEffort" value-field="workEffort">
                 <field-map field-name="workEffortId" env-name="workEffortId"/>
             </entity-one>
             <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
@@ -129,7 +129,7 @@
             </entity-and>
         </actions>
         <row-actions>
-            <entity-one entity-name="Person" value-name="person">
+            <entity-one entity-name="Person" value-field="person">
                 <field-map field-name="partyId" env-name="partyId"/>
             </entity-one>
         </row-actions>