svn commit: r739777 - in /ofbiz/trunk/applications/content: webapp/content/cms/ webapp/content/layout/ webapp/content/lookup/ webapp/content/survey/ widget/ widget/compdoc/ widget/content/ widget/forum/ widget/layout/

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

svn commit: r739777 - in /ofbiz/trunk/applications/content: webapp/content/cms/ webapp/content/layout/ webapp/content/lookup/ webapp/content/survey/ widget/ widget/compdoc/ widget/content/ widget/forum/ widget/layout/

mrisaliti
Author: mrisaliti
Date: Sun Feb  1 15:16:33 2009
New Revision: 739777

URL: http://svn.apache.org/viewvc?rev=739777&view=rev
Log:
Artifact cleaning on content component after recent changes on xsd files (OFBIZ-2137)

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/SurveyScreens.xml
    ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.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/content/widget/layout/LayoutScreens.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=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Sun Feb  1 15:16:33 2009
@@ -35,7 +35,7 @@
     <form name="listFindContent" type="list" target="" paginate-target="/CMSContentFind" view-size="20"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-list-name="listIt">
+            <service service-name="performFind" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="requestParameters"/>
                 <field-map field-name="entityName" from-field="entityName"/>
             </service>

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=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Sun Feb  1 15:16:33 2009
@@ -151,7 +151,7 @@
         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="result" result-map-list-name="listIt">
+              <service service-name="performFind" result-map="result" result-map-list="listIt">
                   <field-map field-name="inputFields" from-field="parameters"/>
                   <field-map field-name="entityName" value="ContentDataResourceView"/>
               </service>

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=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Sun Feb  1 15:16:33 2009
@@ -76,7 +76,7 @@
     <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="result" result-map-list-name="listIt">
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="DataResourceContentView"/>
             </service>

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=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Sun Feb  1 15:16:33 2009
@@ -38,7 +38,7 @@
     <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="result" service-name="performFind">
+            <service result-map-list="listIt" result-map="result" service-name="performFind">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Survey"/>
             </service>
@@ -107,8 +107,8 @@
         <actions>
             <entity-condition entity-name="SurveyMultiRespColumn">
                 <condition-list combine="and">
-                    <condition-expr field-name="surveyId" env-name="surveyMultiResp.surveyId"/>
-                    <condition-expr field-name="surveyMultiRespId" env-name="surveyMultiResp.surveyMultiRespId"/>
+                    <condition-expr field-name="surveyId" from-field="surveyMultiResp.surveyId"/>
+                    <condition-expr field-name="surveyMultiRespId" from-field="surveyMultiResp.surveyMultiRespId"/>
                 </condition-list>
                 <order-by field-name="sequenceNum"/>
             </entity-condition>
@@ -143,7 +143,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="SurveyPage">
-                <condition-expr field-name="surveyId" env-name="surveyId"/>
+                <condition-expr field-name="surveyId" from-field="surveyId"/>
                 <order-by field-name="sequenceNum"/>
             </entity-condition>
         </actions>
@@ -255,7 +255,7 @@
     <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="result" result-map-list-name="listIt">
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="SurveyResponse"/>
             </service>
@@ -280,7 +280,7 @@
     <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="result" result-map-list-name="listIt">
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Survey"/>
             </service>
@@ -301,7 +301,7 @@
     <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="result" result-map-list-name="listIt">
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="SurveyResponse"/>
             </service>

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Feb  1 15:16:33 2009
@@ -317,7 +317,7 @@
             <widgets>
                 <section>
                     <condition>
-                        <if-compare-field field-name="responseContentId" operator="equals" to-field-name="rsp.contentId" />
+                        <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId" />
                     </condition>
                     <widgets>
                         <container style="responseSelected">

Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Sun Feb  1 15:16:33 2009
@@ -156,7 +156,7 @@
                 <set field="surveyId" from-field="parameters.surveyId"/>
                 <entity-one entity-name="Survey" value-field="survey"/>
                 <entity-condition entity-name="SurveyMultiResp" list="surveyMultiRespList">
-                    <condition-expr field-name="surveyId" env-name="surveyId"/>
+                    <condition-expr field-name="surveyId" from-field="surveyId"/>
                     <order-by field-name="surveyMultiRespId"/>
                 </entity-condition>
             </actions>
@@ -164,7 +164,7 @@
                 <decorator-screen name="CommonSurveyDecorator">
                     <decorator-section name="body">
                         <container><label style="h1">${uiLabelMap.PageTitleEditSurveyMultiResps} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}</label></container>
-                        <iterate-section entry-name="surveyMultiResp" list-name="surveyMultiRespList">
+                        <iterate-section entry="surveyMultiResp" list="surveyMultiRespList">
                             <section>
                                 <widgets>
                                     <container style="screenlet">

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sun Feb  1 15:16:33 2009
@@ -109,7 +109,7 @@
                 <set field="labelTitleProperty" value="PageTitleEditWebSiteContent"/>
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
                 <entity-one entity-name="WebSite" value-field="webSite"/>
-                <entity-and entity-name="WebSiteContent" list-name="webSiteContent">
+                <entity-and entity-name="WebSiteContent" list="webSiteContent">
                     <field-map field-name="webSiteId" from-field="webSiteId"/>
                 </entity-and>                
             </actions>
@@ -295,22 +295,22 @@
                     <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">
+                <entity-and entity-name="ContentPurpose" list="currentPurposes">
                     <field-map field-name="contentId" from-field="contentId"/>                    
                 </entity-and>
                 <entity-condition entity-name="ContentPurposeType" list="purposeTypes">
                     <order-by field-name="description"/>
                 </entity-condition>
-                <entity-and entity-name="DataResource" list-name="templates">
+                <entity-and entity-name="DataResource" list="templates">
                     <field-map field-name="dataCategoryId" value="TEMPLATE"/>
                     <order-by field-name="dataResourceName"/>
                 </entity-and>
-                <entity-and entity-name="StatusItem" list-name="statuses">
+                <entity-and entity-name="StatusItem" list="statuses">
                     <field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
                     <order-by field-name="sequenceId"/>
                 </entity-and>
                 <entity-condition entity-name="DataTemplateType" list="templateTypes"/>
-                <entity-and entity-name="Content" list-name="decorators">
+                <entity-and entity-name="Content" list="decorators">
                     <field-map field-name="contentTypeId" value="DECORATOR"/>
                 </entity-and>
             </actions>
@@ -379,7 +379,7 @@
                 <set field="contentId" from-field="parameters.contentId"/>
                 <entity-one entity-name="WebSite" value-field="webSite"/>
                 <entity-one entity-name="Content" value-field="content"/>
-                <entity-and entity-name="WebSitePathAlias" list-name="aliases">
+                <entity-and entity-name="WebSitePathAlias" list="aliases">
                     <field-map field-name="webSiteId" from-field="webSiteId"/>
                     <field-map field-name="contentId" from-field="contentId"/>
                 </entity-and>
@@ -400,7 +400,7 @@
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
                 <entity-one entity-name="WebSite" value-field="webSite"/>
                 <set field="tabButtonItem" value="PathAlias"/>
-                <entity-and entity-name="WebSitePathAlias" list-name="aliases">
+                <entity-and entity-name="WebSitePathAlias" list="aliases">
                     <field-map field-name="webSiteId" from-field="parameters.webSiteId"/>
                 </entity-and>
             </actions>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sun Feb  1 15:16:33 2009
@@ -41,7 +41,7 @@
     <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="results" result-map-list-name="listIt">
+            <service service-name="performFind" result-map="results" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Content"/>
             </service>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Sun Feb  1 15:16:33 2009
@@ -37,8 +37,8 @@
         <menu-item name="viewtree" title="${uiLabelMap.ContentCompDocViewTree}">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_TEMPLATE" field-name="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="TEMPLATE" field-name="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="COMPDOC_TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocTemplateTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
@@ -46,8 +46,8 @@
         <menu-item name="viewtree2" title="${uiLabelMap.ContentCompDocViewTree}">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_INSTANCE" field-name="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="DOCUMENT" field-name="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="COMPDOC_INSTANCE" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="DOCUMENT" field="contentTypeId" operator="equals"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
@@ -68,8 +68,8 @@
         <menu-item name="viewtree" title="View Tree">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_TEMPLATE" field-name="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="TEMPLATE" field-name="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="COMPDOC_TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocTemplateTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
@@ -77,8 +77,8 @@
         <menu-item name="viewtree2" title="View Tree">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_INSTANCE" field-name="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="DOCUMENT" field-name="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="COMPDOC_INSTANCE" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare value="DOCUMENT" field="contentTypeId" operator="equals"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
@@ -98,13 +98,13 @@
         </menu-item>
         <menu-item name="child" title="+Child">
             <condition>
-                <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
             </condition>
             <link target="AddChildCompDocTemplate?rootContentId=${contentId}&amp;sequenceNum=9999"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}&amp; -->
         </menu-item>
         <menu-item name="latest" title="Current Template CompDoc">
             <condition>
-                <if-compare-field field-name="mostRecentRevisionSeqId" operator="greater" to-field-name="rootContentRevisionSeqId"/>
+                <if-compare-field field="mostRecentRevisionSeqId" operator="greater" to-field="rootContentRevisionSeqId"/>
             </condition>
             <link target="ViewCompDocTemplateTree?rootContentId=${contentId}"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}&amp; -->
         </menu-item>
@@ -132,25 +132,25 @@
         -->
         <menu-item name="bef" title="+Bef">
             <condition>
-                <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
             </condition>
             <link target="AddChildCompDocTemplate?contentId=${contentId}&amp;rootContentId=${rootContentId}&amp;caContentAssocTypeId=${contentAssocTypeId}&amp;caSequenceNum=${seqNumBefore}&amp;caFromDate=${fromDate}"/> <!-- &amp;contentRevisionSeqId=${contentRevisionSeqId} -->
         </menu-item>
         <menu-item name="aft" title="+Aft">
             <condition>
-                <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
             </condition>
             <link target="AddChildCompDocTemplate?contentId=${contentId}&amp;rootContentId=${rootContentId}&amp;caContentAssocTypeId=${contentAssocTypeId}&amp;caSequenceNum=${seqNumAfter}&amp;caFromDate=${fromDate}"/> <!-- &amp;contentRevisionSeqId=${contentRevisionSeqId} -->
         </menu-item>
         <menu-item name="up" title="^Up">
             <condition>
-                <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
             </condition>
             <link target="resequenceCompDocPart?contentId=${contentId}&amp;dir=up&amp;contentAssocTypeId=COMPDOC_PART&amp;contentIdTo=${contentIdTo}&amp;caContentAssocTypeId=${contentAssocTypeId}&amp;caSequenceNum=${seqNumBefore}&amp;caFromDate=${fromDate}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
         </menu-item>
         <menu-item name="down" title="vDn">
             <condition>
-                <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
             </condition>
             <link target="resequenceCompDocPart?contentId=${contentId}&amp;dir=down&amp;contentAssocTypeId=COMPDOC_PART&amp;contentIdTo=${contentIdTo}&amp;caContentAssocTypeId=${contentAssocTypeId}&amp;caSequenceNum=${seqNumBefore}&amp;caFromDate=${fromDate}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
         </menu-item>
@@ -168,7 +168,7 @@
         </menu-item>
         <menu-item name="latest" title="Current Instance CompDoc">
             <condition>
-                <if-compare-field field-name="mostRecentRevisionSeqId" operator="greater" to-field-name="rootContentRevisionSeqId"/>
+                <if-compare-field field="mostRecentRevisionSeqId" operator="greater" to-field="rootContentRevisionSeqId"/>
             </condition>
             <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}&amp; -->
         </menu-item>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sun Feb  1 15:16:33 2009
@@ -205,7 +205,7 @@
                     <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">
+                <entity-and entity-name="ContentRevision" list="contentRevisionList" use-cache="true">
                     <field-map from-field="contentId" field-name="contentId"/>
                 </entity-and>
 
@@ -289,7 +289,7 @@
                 <set field="currentMenuItemName" value="revision"/>
                 <set field="title" value="${uiLabelMap.ContentCompDocRevisionListPageForContent} ${rootContentId} ${uiLabelMap.ContentCompDocRevisions} ${rootContentRevisionSeqId}"/>
                     
-                <entity-and entity-name="ContentRevisionItem" list-name="contentRevisionItemList" use-cache="true">
+                <entity-and entity-name="ContentRevisionItem" list="contentRevisionItemList" use-cache="true">
                     <field-map field-name="contentId" from-field="parameters.contentId"/>
                     <field-map field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId"/>
                 </entity-and>
@@ -441,7 +441,7 @@
                 <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
                 <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">
+                <entity-and entity-name="Content" list="compDocFindList">
                     <field-map field-name="instanceOfContentId" from-field="parameters.rootContentId"/>
                     <field-map field-name="contentTypeId" value="COMPDOC_INSTANCE"/>
                 </entity-and>
@@ -485,7 +485,7 @@
                 <set from-field="content.contentTypeId" field="contentTypeId"/>
                 <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true">
                     <condition-list combine="and">
-                        <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
+                        <condition-expr field-name="contentId" from-field="rootContentId" operator="equals"/>
                     </condition-list>
                     <order-by field-name="-contentRevisionSeqId"/>
                 </entity-condition>
@@ -599,9 +599,9 @@
                     -->
                 <entity-condition entity-name="ContentRevisionItem" list="contentRevisionItems" use-cache="true">
                     <condition-list combine="and">
-                        <condition-expr field-name="contentId" env-name="rootContentId"/>
-                        <condition-expr field-name="itemContentId" env-name="contentId"/>
-                        <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
+                        <condition-expr field-name="contentId" from-field="rootContentId"/>
+                        <condition-expr field-name="itemContentId" from-field="contentId"/>
+                        <condition-expr field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
                     </condition-list>
                     <order-by field-name="-contentRevisionSeqId"/>
                 </entity-condition>
@@ -627,7 +627,7 @@
                             <decorator-section name="body">
                                 <section>
                                     <condition>
-                                        <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                                        <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
                                     </condition>
                                     <widgets>
                                         <container><label style="tableheadtext" text="Editing Latest Revision [${mostRecentRevisionSeqId}]"/></container>
@@ -641,7 +641,7 @@
                                         <and>
                                             <not><if-empty field="mostRecentRevisionSeqId"/></not>
                                             <not><if-empty field="rootContentRevisionSeqId"/></not>
-                                            <if-compare-field field-name="mostRecentRevisionSeqId" operator="greater" to-field-name="rootContentRevisionSeqId"/>
+                                            <if-compare-field field="mostRecentRevisionSeqId" operator="greater" to-field="rootContentRevisionSeqId"/>
                                         </and>
                                     </condition>
                                     <widgets>
@@ -921,7 +921,7 @@
                 <set value="COMPDOC_INSTANCE" field="contentTypeId"/>
                 <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true">
                     <condition-list combine="and">
-                        <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
+                        <condition-expr field-name="contentId" from-field="rootContentId" operator="equals"/>
                     </condition-list>
                     <order-by field-name="-contentRevisionSeqId"/>
                 </entity-condition>
@@ -978,7 +978,7 @@
                 </entity-one>
                 <set from-field="templateContent.contentName" field="contentName"/>
 
-                <get-related-one value-name="templateContent" relation-name="DataResource" to-value-name="templateDataResource"/>
+                <get-related-one value-field="templateContent" relation-name="DataResource" to-value-field="templateDataResource"/>
                 <set field="templateDataResourceTypeId" from-field="templateDataResource.dataResourceTypeId"/>
                 <set field="mimeTypeId" from-field="templateDataResource.mimeTypeId"/>
 
@@ -1083,7 +1083,7 @@
                 <set from-field="instanceContent.instanceOfContentId" field="templateContentId"/>
                 <entity-condition entity-name="ContentRevision" list="contentTemplateRevisions" use-cache="true">
                     <condition-list combine="and">
-                        <condition-expr field-name="contentId" env-name="templateContentId" operator="equals"/>
+                        <condition-expr field-name="contentId" from-field="templateContentId" operator="equals"/>
                     </condition-list>
                     <order-by field-name="-contentRevisionSeqId"/>
                 </entity-condition>
@@ -1132,7 +1132,7 @@
                     <section>
                         <condition>
                             <and>
-                                <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                                <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
                                 <if-compare field="approvalStatusResult.approvalStatusId" operator="equals" value="CNTAP_NOT_READY"/>
                             </and>
                         </condition>
@@ -1165,15 +1165,15 @@
                       -->
                 <entity-condition entity-name="ContentAssocRevisionItemView" use-cache="false" list="assocRevisionItemViewList">
                    <condition-list combine="and">
-                        <condition-expr field-name="contentIdTo" operator="equals" env-name="rootContentId"/>
-                        <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId"/>
-                        <condition-expr field-name="instanceOfContentId" operator="equals" env-name="contentId"/>
+                        <condition-expr field-name="contentIdTo" operator="equals" from-field="rootContentId"/>
+                        <condition-expr field-name="rootRevisionContentId" operator="equals" from-field="rootContentId"/>
+                        <condition-expr field-name="instanceOfContentId" operator="equals" from-field="contentId"/>
                         <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
-                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId"/>
-                        <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="rootContentRevisionSeqId"/>
+                        <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
                         <condition-list combine="or">
                             <condition-expr field-name="thruDate" operator="equals" value=""/>
-                            <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+                            <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
                         </condition-list>
                    </condition-list>
                   
@@ -1204,7 +1204,7 @@
                     <label text="${contentName}" style="tableheadtext"/>
                     <section>
                         <condition>
-                            <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+                            <if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
                         </condition>
                         <widgets>
                             <link text="Add Instance"
@@ -1213,7 +1213,7 @@
                         </widgets>
                     </section>
                 </container>
-                <iterate-section entry-name="assocRevisionItemView" list-name="assocRevisionItemViewList">
+                <iterate-section entry="assocRevisionItemView" list="assocRevisionItemViewList">
                     <section>
                         <actions>
                             <entity-one entity-name="Content" value-field="instanceContent" auto-field-map="false">

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml Sun Feb  1 15:16:33 2009
@@ -29,14 +29,14 @@
             <sub-node node-name="node-body">
                 <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
                    <condition-list combine="and">
-                        <condition-expr field-name="contentIdTo" operator="equals" env-name="rootContentId"/>
-                        <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId"/>
-                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" ignore-if-null="true"/>
+                        <condition-expr field-name="contentIdTo" operator="equals" from-field="rootContentId"/>
+                        <condition-expr field-name="rootRevisionContentId" operator="equals" from-field="rootContentId"/>
+                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="rootContentRevisionSeqId" ignore-if-null="true"/>
                         <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
-                        <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+                        <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
                         <condition-list combine="or">
                             <condition-expr field-name="thruDate" operator="equals" value=""/>
-                            <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+                            <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
                         </condition-list>
                    </condition-list>
                   
@@ -61,14 +61,14 @@
             <sub-node node-name="node-body">
                 <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
                    <condition-list combine="and">
-                        <condition-expr field-name="contentIdTo" operator="equals" env-name="contentId"/>
-                        <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId"/>
+                        <condition-expr field-name="contentIdTo" operator="equals" from-field="contentId"/>
+                        <condition-expr field-name="rootRevisionContentId" operator="equals" from-field="rootContentId"/>
                         <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
-                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" ignore-if-null="true"/>
-                        <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="rootContentRevisionSeqId" ignore-if-null="true"/>
+                        <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
                         <condition-list combine="or">
                             <condition-expr field-name="thruDate" operator="equals" value=""/>
-                            <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+                            <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
                         </condition-list>
                    </condition-list>
                   
@@ -97,14 +97,14 @@
             <sub-node node-name="node-body">
                 <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
                    <condition-list combine="and">
-                        <condition-expr field-name="contentIdTo" operator="equals" env-name="templateContentId"/>
-                        <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="templateContentId"/>
-                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId" ignore-if-null="true"/>
+                        <condition-expr field-name="contentIdTo" operator="equals" from-field="templateContentId"/>
+                        <condition-expr field-name="rootRevisionContentId" operator="equals" from-field="templateContentId"/>
+                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="templateContentRevisionSeqId" ignore-if-null="true"/>
                         <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
-                        <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+                        <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
                         <condition-list combine="or">
                             <condition-expr field-name="thruDate" operator="equals" value=""/>
-                            <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+                            <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
                         </condition-list>
                    </condition-list>
                   
@@ -129,14 +129,14 @@
             <sub-node node-name="node-body">
                 <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
                    <condition-list combine="and">
-                        <condition-expr field-name="contentIdTo" operator="equals" env-name="contentId"/>
-                        <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="templateContentId"/>
+                        <condition-expr field-name="contentIdTo" operator="equals" from-field="contentId"/>
+                        <condition-expr field-name="rootRevisionContentId" operator="equals" from-field="templateContentId"/>
                         <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
-                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId"/>
-                        <condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
+                        <condition-expr field-name="contentRevisionSeqId" operator="less-equals" from-field="templateContentRevisionSeqId"/>
+                        <condition-expr field-name="fromDate" operator="less-equals" from-field="nowTimestamp"/>
                         <condition-list combine="or">
                             <condition-expr field-name="thruDate" operator="equals" value=""/>
-                            <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+                            <condition-expr field-name="thruDate" operator="greater" from-field="nowTimestamp"/>
                         </condition-list>
                    </condition-list>
                   

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sun Feb  1 15:16:33 2009
@@ -285,7 +285,7 @@
                 <set field="labelTitleProperty" value="PageTitleFindWebSite"/>
                 <set field="tabButtonItem" value="websites"/>
                 <entity-condition entity-name="WebSiteAndContent" list="webSites">
-                    <condition-expr field-name="contentId" env-name="parameters.contentId"/>
+                    <condition-expr field-name="contentId" from-field="parameters.contentId"/>
                     <order-by field-name="webSiteId"/>
                 </entity-condition>
                 <entity-one entity-name="Content" value-field="currentValue">

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sun Feb  1 15:16:33 2009
@@ -60,7 +60,7 @@
     <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="result" result-map-list-name="listIt">
+          <service service-name="performFind" result-map="result" result-map-list="listIt">
             <field-map field-name="inputFields" from-field="parameters"/>
             <field-map field-name="entityName" value="DataResource"/>
             <field-map field-name="orderBy" value="dataResourceId"/>
@@ -116,7 +116,7 @@
     <form name="ListLookupDataResource" extends="ListDataResource" list-name="listIt" type="list" paginate-target="LookupDataResource"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="performFind" result-map-list-name="listIt">
+            <service service-name="performFind" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="DataResource"/>
                 <field-map field-name="orderBy" value="dataResourceId"/>
@@ -194,7 +194,7 @@
     <form name="ListContentsAssociatedToDataResource" type="list" list-name="contentRecords" default-widget-style="display"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-and entity-name="Content" list-name="contentRecords">
+            <entity-and entity-name="Content" list="contentRecords">
                 <field-map field-name="dataResourceId" from-field="dataResourceId"/>
                 <order-by field-name="contentId"/>
             </entity-and>
@@ -332,7 +332,7 @@
     <form name="ListDataResourceAttribute" list-name="dataResourceAttribute" target="updateDataResourceAttribute" title="" type="list"
         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">
+            <service service-name="performFind" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" from-field="entityName" value="DataResourceAttribute"/>
             </service>
@@ -361,7 +361,7 @@
     <form name="ListDataResourceRole" list-name="dataResourceRole" target="updateDataResourceRole" title="" type="list"
         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">
+            <service service-name="performFind" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" from-field="entityName" value="DataResourceRole"/>
             </service>
@@ -385,7 +385,7 @@
     <form name="ListDataResourceProductFeature" list-name="productFeatureDataResource" target="" title="" type="list"
         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">
+            <service service-name="performFind" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" from-field="entityName" value="ProductFeatureDataResource"/>
             </service>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Sun Feb  1 15:16:33 2009
@@ -69,7 +69,7 @@
                 <set field="titleProperty" value="PageTitleNavigateDataResources"/>
                 <set field="tabButtonItem" value="navigateDataResource"/>
                 <set field="labelTitleProperty" value="PageTitleNavigateDataResources"/>
-                <entity-and entity-name="DataCategory" list-name="subCategories">
+                <entity-and entity-name="DataCategory" list="subCategories">
                     <field-map field-name="parentCategoryId" value="ROOT"/>
                 </entity-and>
             </actions>
@@ -175,7 +175,7 @@
                 <set field="tabButtonItem" value="editDataResource"/>
                 <set field="dataResourceId" from-field="parameters.dataResourceId"/>
                 <entity-one entity-name="DataResource" value-field="currentValue"/>
-                <entity-condition entity-name="DataCategory" list-name="dataCategoryList"/>
+                <entity-condition entity-name="DataCategory" list="dataCategoryList"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
@@ -395,7 +395,7 @@
                 <entity-one entity-name="DataResource" value-field="currentValue">
                     <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
                 </entity-one>
-                <get-related value-name="currentValue" relation-name="DataResourceAttribute" list-name="dataResourceAttribute"/>
+                <get-related value-field="currentValue" relation-name="DataResourceAttribute" list="dataResourceAttribute"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
@@ -418,7 +418,7 @@
                 <entity-one entity-name="DataResource" value-field="currentValue">
                     <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
                 </entity-one>
-                <get-related value-name="currentValue" relation-name="DataResourceRole" list-name="dataResourceRole"/>
+                <get-related value-field="currentValue" relation-name="DataResourceRole" list="dataResourceRole"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
@@ -441,7 +441,7 @@
                 <entity-one entity-name="DataResource" value-field="currentValue">
                     <field-map field-name="dataResourceId" from-field="parameters.dataResourceId"/>
                 </entity-one>
-                <get-related value-name="currentValue" relation-name="ProductFeatureDataResource" list-name="productFeatureDataResource"/>
+                <get-related value-field="currentValue" relation-name="ProductFeatureDataResource" list="productFeatureDataResource"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sun Feb  1 15:16:33 2009
@@ -145,7 +145,7 @@
             <set field="message.forumMessageName" from-field="contentData.resultData.content.contentName"/>
             <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">
+            <entity-and entity-name="ContentAssoc" list="contentAssocList" filter-by-date="true">
                 <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"/>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Sun Feb  1 15:16:33 2009
@@ -63,7 +63,7 @@
                 <set field="titleProperty" value="PageTitleFindForumGroup"/>
                 <set field="headerItem" value="ForumGroups"/>
                 <set field="labelTitleProperty" value="PageTitleFindForumGroup"/>
-                <entity-and entity-name="Content" list-name="forumGroups">
+                <entity-and entity-name="Content" list="forumGroups">
                     <field-map field-name="contentTypeId" value="FORUM_ROOT"/>
                     <order-by field-name="contentName"/>
                 </entity-and>
@@ -93,7 +93,7 @@
                 </entity-one>
                 <set field="objectName" from-field="forumGroup.contentName"/>
                 <set field="objectId"  from-field="forumGroup.contentId"/>
-                <entity-and entity-name="ContentAssocDataResourceViewTo" list-name="forums">
+                <entity-and entity-name="ContentAssocDataResourceViewTo" list="forums">
                     <field-map field-name="contentIdStart" from-field="forumGroupId"/>
                 </entity-and>
             </actions>
@@ -121,7 +121,7 @@
                 </entity-one>
                 <set field="objectName" from-field="forumGroup.contentName"/>
                 <set field="objectId"  from-field="forumGroup.contentId"/>
-                <entity-and entity-name="ContentRole" list-name="forumRoles">
+                <entity-and entity-name="ContentRole" list="forumRoles">
                     <field-map field-name="contentId" from-field="parameters.forumGroupId"/>
                     <order-by field-name="roleTypeId"/>
                 </entity-and>
@@ -150,7 +150,7 @@
                 </entity-one>
                 <set field="objectName" from-field="forumGroup.contentName"/>
                 <set field="objectId"  from-field="forumGroup.contentId"/>
-                <entity-and entity-name="ContentPurpose" list-name="forumPurposes">
+                <entity-and entity-name="ContentPurpose" list="forumPurposes">
                     <field-map field-name="contentId" from-field="parameters.forumGroupId"/>
                     <order-by field-name="contentPurposeTypeId"/>
                 </entity-and>
@@ -182,7 +182,7 @@
                 <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">
+                <entity-and entity-name="ContentAssocViewTo" list="forumMessages">
                     <field-map field-name="ownerContentId" from-field="parameters.forumId"/>
                     <order-by field-name="createdDate DESC"/>
                 </entity-and>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumTrees.xml Sun Feb  1 15:16:33 2009
@@ -32,7 +32,7 @@
             <sub-node node-name="node-body">
                 <entity-condition entity-name="ContentAssocViewTo" use-cache="false" >
                     <condition-list combine="and">
-                        <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId"/>
+                        <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId"/>
                         <condition-list combine="or">
                             <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/>
                             <condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK"/>
@@ -48,7 +48,7 @@
             <sub-node node-name="node-body">
                 <entity-condition entity-name="ContentAssocViewTo" use-cache="true">
                     <condition-list combine="and">
-                        <condition-expr field-name="contentIdStart" operator="equals" env-name="rsp.contentId"/>
+                        <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId"/>
                         <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/>
                         <condition-expr field-name="caThruDate" operator="equals" value=""/>
                     </condition-list>

Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=739777&r1=739776&r2=739777&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Sun Feb  1 15:16:33 2009
@@ -60,7 +60,7 @@
                 <set field="tabButtonItem" to-scope="user" value="ListLayout"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
-                <entity-and entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList">
+                <entity-and entity-name="ContentAssocDataResourceViewFrom" list="layoutList">
                     <field-map field-name="caContentIdTo" value="TEMPLATE_MASTER"/>
                 </entity-and>
             </actions>