svn commit: r730098 [2/9] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/scr...

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 03:28:24 2008
@@ -47,7 +47,7 @@
         </if-empty>
         <log message="genCompDocInstance> contentRevisionSeqId: ${contentRevisionSeqId}" level="info"/>
 
-        <make-value entity-name="Content" value-name="rootInstanceContent"/>
+        <make-value entity-name="Content" value-field="rootInstanceContent"/>
         <if-empty field="parameters.rootInstanceContentId">
             <sequenced-id-to-env sequence-name="Content" env-name="rootInstanceContent.contentId"/>
             <log level="info" message="genCompDocInstance 2> rootInstanceContent: ${rootInstanceContent}"/>
@@ -121,14 +121,14 @@
         </entity-condition>
         <log message="genInstanceChildCompDocs 1> contentAssocList: ${contentAssocList}" level="info"/>
 
-        <iterate list-name="contentAssocList" entry-name="templateContentAssoc">
+        <iterate list="contentAssocList" entry="templateContentAssoc">
             <clone-value value-name="templateContent" new-value-name="instanceContent"/>
 
             <sequenced-id-to-env sequence-name="Content" env-name="instanceContent.contentId"/>
 
             <set value="TEMPLATE" field="instanceContent.contentTypeId"/>
             <create-value value-name="instanceContent"/>
-            <make-value entity-name="ContentAssoc" value-name="instanceContentAssoc"/>
+            <make-value entity-name="ContentAssoc" value-field="instanceContentAssoc"/>
             <set from-field="thisInstanceContentId" field="instanceContentAssoc.contentIdTo"/>
             <set from-field="instanceContent.contentId" field="instanceContentAssoc.contentId"/>
             <set value="COMPDOC_PART" field="instanceContentAssoc.contentAssocTypeId"/>
@@ -332,7 +332,7 @@
             <fail-message message="Security Error: to run createContentRevision you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentRevision" value-name="newEntity"/>
+        <make-value entity-name="ContentRevision" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -342,7 +342,7 @@
             <fail-message message="Security Error: to run updateContentRevision you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentRevision" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRevision" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -353,7 +353,7 @@
             <fail-message message="Security Error: to run removeContentRevision you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentRevision" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRevision" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -364,7 +364,7 @@
             <fail-message message="Security Error: to run createContentRevisionItem you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentRevisionItem" value-name="newEntity"/>
+        <make-value entity-name="ContentRevisionItem" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -374,7 +374,7 @@
             <fail-message message="Security Error: to run updateContentRevisionItem you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentRevisionItem" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRevisionItem" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -385,7 +385,7 @@
             <fail-message message="Security Error: to run removeContentRevisionItem you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentRevisionItem" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRevisionItem" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -401,7 +401,7 @@
             <set field="newEntity" from-field="contentRevisionList[0]"/>
             <set field="incrementedSeq" from-field="newEntity.contentRevisionSeqId"/>
             <else>
-                <make-value entity-name="ContentRevision" value-name="newEntity"/>
+                <make-value entity-name="ContentRevision" value-field="newEntity"/>
             </else>
         </if-not-empty>
         <log level="info" message="incrementedSeq(0): ${incrementedSeq}"/>
@@ -432,7 +432,7 @@
         <log level="info" message="ContentRevision(1): ${newEntity}"/>
         <create-value value-name="newEntity"/>
         <if-not-empty field="parameters.itemContentId">
-            <make-value entity-name="ContentRevisionItem" value-name="newEntity"/>
+            <make-value entity-name="ContentRevisionItem" value-field="newEntity"/>
             <set-pk-fields map-name="parameters" value-name="newEntity"/>
             <set field="newEntity.contentRevisionSeqId" from-field="paddedSeqId"/>
             <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -490,7 +490,7 @@
             <fail-message message="Security Error: to run createContentApproval you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentApproval" value-name="newEntity"/>
+        <make-value entity-name="ContentApproval" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <if-empty field="newEntity.contentApprovalId">
@@ -506,7 +506,7 @@
             <fail-message message="Security Error: to run updateContentApproval you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentApproval" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentApproval" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -517,7 +517,7 @@
             <fail-message message="Security Error: to run removeContentApproval you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
         </check-permission>
         <check-errors/>
-        <make-value entity-name="ContentApproval" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentApproval" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -543,7 +543,7 @@
         <log level="info" message="contentRevisionSeqId: ${parameters.contentRevisionSeqId}"/>
         <set field="inMap2.userLogin" from-field="userLogin"/>
         <!--  since we don't have a primary key from above, go get one -->
-        <iterate list-name="instanceApprovalList" entry-name="maxContentApproval">
+        <iterate list="instanceApprovalList" entry="maxContentApproval">
             <log level="info" message="maxContentApproval: ${maxContentApproval}"/>
             <entity-condition entity-name="ContentApproval" list-name="contentApprovalList2" use-cache="false">
                 <condition-list>
@@ -592,7 +592,7 @@
             <field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/>
         </entity-and>
         <log level="info" message="templateContentApprovalList 0aa: ${templateContentApprovalList}"/>
-        <iterate list-name="templateContentApprovalList" entry-name="templateContentApproval">
+        <iterate list="templateContentApprovalList" entry="templateContentApproval">
             <clone-value value-name="templateContentApproval" new-value-name="contentApproval"/>
             <set from-field="parameters.contentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
             <set from-field="parameters.contentId" field="contentApproval.contentId"/>
@@ -646,7 +646,7 @@
                     <field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/>
                 </entity-and>
                 <log level="info" message="templateContentApprovalList 0aa: ${templateContentApprovalList}"/>
-                <iterate list-name="templateContentApprovalList" entry-name="templateContentApproval">
+                <iterate list="templateContentApprovalList" entry="templateContentApproval">
                     <clone-value value-name="templateContentApproval" new-value-name="contentApproval"/>
                     <set from-field="thisContentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
                     <set from-field="thisContentId" field="contentApproval.contentId"/>
@@ -669,7 +669,7 @@
                 <log level="info" message="cloneContentApprovals(2)- finalApprovalStatusId : ${finalApprovalStatusId} "/>
                 <log level="info" message="cloneContentApprovals(2b)- contentApprovalList : ${contentApprovalList} "/>
                 <!--  conditionally set the contentApprovalId status of each entity -->
-                <iterate list-name="contentApprovalList" entry-name="existingContentApproval">
+                <iterate list="contentApprovalList" entry="existingContentApproval">
                     <clone-value value-name="existingContentApproval" new-value-name="contentApproval"/>
                     <set from-field="thisContentRevisionSeqId" field="contentApproval.contentRevisionSeqId"/>
 
@@ -738,7 +738,7 @@
                     <field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/>
                 </entity-and>
                 <log level="info" message="templateContentApprovalList 0aa: ${templateContentApprovalList}"/>
-                <iterate list-name="templateContentApprovalList" entry-name="templateContentApproval">
+                <iterate list="templateContentApprovalList" entry="templateContentApproval">
                     <!--  look for this entity in newly created entities -->
                     <entity-condition entity-name="ContentApproval" list-name="newContentApprovalList">
                         <condition-list combine="and">
@@ -764,7 +764,7 @@
         </if>
     </simple-method>
     <simple-method method-name="hasApprovalPermission" short-description="Determine ContentApproval permission from passed value">
-        <make-value entity-name="ContentApproval" value-name="contentApprovalPK"/>
+        <make-value entity-name="ContentApproval" value-field="contentApprovalPK"/>
         <set field="contentApprovalPK.contentApprovalId" from-field="parameters.contentApprovalId"/>
         <find-by-primary-key entity-name="ContentApproval" value-name="contentApproval" map-name="contentApprovalPK" use-cache="true"/>
         <set field="partyId" from-field="parameters.userLogin.partyId"/>
@@ -833,7 +833,7 @@
             </condition>
             <then>
                 <set value="CNTAP_READY" field="finalApprovalStatusId"/>
-                <iterate list-name="contentApprovalList" entry-name="existingContentApproval">
+                <iterate list="contentApprovalList" entry="existingContentApproval">
                     <if>
                         <condition>
                             <or>
@@ -880,7 +880,7 @@
             <field-map field-name="partyId" from-field="partyId"/>
         </entity-and>
         <log level="info" message="userLogin.partyId: ${partyId}"/>
-        <iterate list-name="partyRoleList" entry-name="partyRole">
+        <iterate list="partyRoleList" entry="partyRole">
             <set from-field="partyRole.roleTypeId" field="roles[]"/>
         </iterate>
         <log level="info" message="roles: ${roles}"/>
@@ -902,7 +902,7 @@
         </entity-condition>
         <log level="info" message="compdocApprovalList: ${compdocApprovalList}"/>
         <!-- above query does not get contentApprovalId. For each row find it -->
-        <iterate list-name="compdocApprovalList" entry-name="maxContentApproval">
+        <iterate list="compdocApprovalList" entry="maxContentApproval">
             <log level="info" message="maxContentApproval: ${maxContentApproval}"/>
             <entity-condition entity-name="ContentApproval" list-name="contentApprovalList2" use-cache="false">
                 <condition-list>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Tue Dec 30 03:28:24 2008
@@ -24,7 +24,7 @@
         <log level="always" message="in createContentAndPurpose."/>
         <log level="always" message="parameters: ${parameters}"/>
 
-        <make-value entity-name="Content" value-name="currentContent"/>
+        <make-value entity-name="Content" value-field="currentContent"/>
         <set-pk-fields map-name="parameters" value-name="currentContent"/>
         <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
         <call-map-processor in-map-name="currentContent" out-map-name="currentContent">
@@ -66,7 +66,7 @@
         <if-not-empty field="entityMap">
             <set field="currentEntityMap" from-field="entityMap"/>
         </if-not-empty>
-        <make-value entity-name="Content" value-name="contentPK"/>
+        <make-value entity-name="Content" value-field="contentPK"/>
         <set field="contentPK.contentId" from-field="contentId"/>
         <log level="always" message="contentPK: ${contentPK}"/>
         <set field="currentEntityMap.Content" from-field="contentPK"/>
@@ -75,7 +75,7 @@
 
         <if-not-empty field="parameters.contentPurposeTypeId">
             <log level="always" message="contentPurposeTypeId: ${parameters.contentPurposeTypeId}"/>
-            <make-value entity-name="ContentPurpose" value-name="newContentPurpose"/>
+            <make-value entity-name="ContentPurpose" value-field="newContentPurpose"/>
             <set field="newContentPurpose.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
             <log level="always" message="contentId: ${contentId}"/>
             <set field="newContentPurpose.contentId" from-field="contentId"/>
@@ -88,7 +88,7 @@
         <log level="always" message="/nin updateContent."/>
         <log level="always" message="parameters: ${parameters}"/>
 
-        <make-value entity-name="Content" value-name="currentContent"/>
+        <make-value entity-name="Content" value-field="currentContent"/>
         <set-pk-fields map-name="parameters" value-name="currentContent"/>
         <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
         <call-map-processor in-map-name="currentContent" out-map-name="currentContent">

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Tue Dec 30 03:28:24 2008
@@ -20,7 +20,7 @@
                 xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
 
     <simple-method method-name="createContentAndPurpose" short-description="Create Content And Purpose" login-required="false">
-        <make-value entity-name="Content" value-name="currentContent"/>
+        <make-value entity-name="Content" value-field="currentContent"/>
         <set-pk-fields map-name="parameters" value-name="currentContent"/>
         <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
         <if-empty field="currentContent.contentId">
@@ -55,7 +55,7 @@
         <if-compare field="permissionStatus" operator="equals" type="String" value="granted">
             <create-value value-name="currentContent"/>
             <if-not-empty field="parameters.contentPurposeTypeId">
-                <make-value entity-name="ContentPurpose" value-name="newContentPurpose"/>
+                <make-value entity-name="ContentPurpose" value-field="newContentPurpose"/>
                 <set field="newContentPurpose.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
                 <set field="newContentPurpose.contentId" from-field="currentContent.contentId"/>
                 <create-value value-name="newContentPurpose"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 03:28:24 2008
@@ -23,7 +23,7 @@
 
     <!-- base content CRUD services -->
     <simple-method method-name="createContent" short-description="Create a Content Record">
-        <make-value value-name="content" entity-name="Content"/>
+        <make-value value-field="content" entity-name="Content"/>
         <set-nonpk-fields value-name="content" map-name="parameters"/>
         <set-pk-fields value-name="content" map-name="parameters"/>
 
@@ -64,7 +64,7 @@
         <field-to-result field-name="content.contentId" result-name="contentId"/>
     </simple-method>
     <simple-method method-name="removeContent" short-description="Remove a Content Record">
-        <make-value entity-name="Content" value-name="lookupKeyValue"/>
+        <make-value entity-name="Content" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="Content" map-name="lookupKeyValue" value-name="content"/>
 
@@ -73,7 +73,7 @@
 
     <!-- content assoc services -->
     <simple-method method-name="createContentAssoc" short-description="Create a ContntAssoc Record">
-        <make-value value-name="assoc" entity-name="ContentAssoc"/>
+        <make-value value-field="assoc" entity-name="ContentAssoc"/>
         <set-nonpk-fields value-name="assoc" map-name="parameters"/>
         <set-pk-fields value-name="assoc" map-name="parameters"/>
         <set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" />
@@ -104,7 +104,7 @@
         <store-value value-name="assoc"/>
     </simple-method>
     <simple-method method-name="removeContentAssoc" short-description="Remove a Content Assoc Record">
-        <make-value entity-name="ContentAssoc" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentAssoc" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssoc" map-name="lookupKeyValue" value-name="assoc"/>
 
@@ -165,7 +165,7 @@
         <entity-and entity-name="ContentAssoc" list-name="assocs">
             <field-map field-name="contentId" from-field="parameters.contentId"/>
         </entity-and>
-        <iterate entry="assoc" list-name="assocs">
+        <iterate entry="assoc" list="assocs">
             <set field="assoc.contentId" from-field="newContentId"/>
             <set-service-fields service-name="createContentAssoc" map-name="assoc" to-map-name="assocS"/>
             <call-service service-name="createContentAssoc" in-map-name="assocS"/>
@@ -174,7 +174,7 @@
         <entity-and entity-name="ContentAssoc" list-name="assocsTo">
             <field-map field-name="contentIdTo" from-field="parameters.contentId"/>
         </entity-and>
-        <iterate entry="assocTo" list-name="assocsTo">
+        <iterate entry="assocTo" list="assocsTo">
             <set field="assocTo.contentIdTo" from-field="newContentId"/>
             <set-service-fields service-name="createContentAssoc" map-name="assocTo" to-map-name="assocTos"/>
             <call-service service-name="createContentAssoc" in-map-name="assocTos"/>
@@ -203,7 +203,7 @@
         <find-by-primary-key value-name="fromContent" entity-name="Content" map-name="pk" />
 
         <if-compare field="permissionStatus" operator="equals" type="String" value="granted">
-            <make-value entity-name="ContentAssoc" value-name="newContentAssoc"/>
+            <make-value entity-name="ContentAssoc" value-field="newContentAssoc"/>
             <set from-field="parameters.contentIdTo"           field="newContentAssoc.contentIdTo"/>
             <set from-field="parameters.contentIdFrom"         field="newContentAssoc.contentId"/>
             <set from-field="parameters.contentAssocTypeId"    field="newContentAssoc.contentAssocTypeId"/>
@@ -227,20 +227,20 @@
         
     <!-- Methods for ContentMetaData -->
     <simple-method method-name="createContentMetaData" short-description="Create Content Meta Data">
-        <make-value entity-name="ContentMetaData" value-name="newEntity"/>
+        <make-value entity-name="ContentMetaData" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentMetaData" short-description="Update Content Meta Data">
-        <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentMetaData" short-description="Remove Content Meta Data">        
-        <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -251,16 +251,16 @@
         <if-empty field="parameters.fromDate">
             <now-timestamp-to-env env-name="parameters.fromDate"/>
         </if-empty>
-        <make-value value-name="partyRolePK" entity-name="PartyRole"/>
+        <make-value value-field="partyRolePK" entity-name="PartyRole"/>
         <set-pk-fields value-name="partyRolePK" map-name="parameters"/>
         <find-by-primary-key entity-name="PartyRole" map-name="partyRolePK" value-name="partyRole"/>
         <if-empty field="partyRole">
-            <make-value entity-name="PartyRole" map-name="partyRolePK" value-name="partyRole"/>
+            <make-value entity-name="PartyRole" map-name="partyRolePK" value-field="partyRole"/>
             <create-value value-name="partyRole"/>
         </if-empty>
         <check-errors/>
 
-        <make-value entity-name="ContentRole" value-name="newEntity"/>
+        <make-value entity-name="ContentRole" value-field="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <find-by-primary-key entity-name="ContentRole" map-name="newEntity" value-name="contentRole"/>
         <if-empty field="contentRole">
@@ -270,26 +270,26 @@
         <check-errors/>
     </simple-method>
     <simple-method method-name="updateContentRole" short-description="Update Content Role">
-        <make-value entity-name="ContentRole" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deactivateAllContentRoles" short-description="Update Content Role">                        
-        <make-value entity-name="ContentRole" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
         <set from-field="parameters.contentId" field="lookupKeyValue.contentId"/>
         <set from-field="parameters.partyId" field="lookupKeyValue.partyId"/>
         <set from-field="parameters.roleTypeId" field="lookupKeyValue.roleTypeId"/>
         <find-by-and entity-name="ContentRole" map-name="lookupKeyValue" list-name="roleList"/>
-        <iterate entry="contentRoleMap" list-name="roleList">
-            <make-value entity-name="ContentRole" value-name="role" map-name="contentRoleMap"/>
+        <iterate entry="contentRoleMap" list="roleList">
+            <make-value entity-name="ContentRole" value-field="role" map-name="contentRoleMap"/>
             <now-timestamp-to-env env-name="role.thruDate"/>
             <store-value value-name="role"/>
         </iterate>
     </simple-method>
     <simple-method method-name="removeContentRole" short-description="Remove Content Role">        
-        <make-value entity-name="ContentRole" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -298,21 +298,21 @@
     
   <!-- Methods for ContentType -->
     <simple-method method-name="createContentType" short-description="Create Content Type">
-        <make-value entity-name="ContentType" value-name="newEntity"/>
+        <make-value entity-name="ContentType" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result map-name="newEntity" field-name="contentTypeId" />
     </simple-method>
     <simple-method method-name="updateContentType" short-description="Update Content Type">
-        <make-value entity-name="ContentType" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentType" short-description="Remove Content Type">
-        <make-value entity-name="ContentType" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -320,13 +320,13 @@
     
     <!-- Methods for ContentTypeAttr -->
     <simple-method method-name="createContentTypeAttr" short-description="Create Content TypeAttr">
-        <make-value entity-name="ContentTypeAttr" value-name="newEntity"/>
+        <make-value entity-name="ContentTypeAttr" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="removeContentTypeAttr" short-description="Remove Content TypeAttr">
-        <make-value entity-name="ContentTypeAttr" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentTypeAttr" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentTypeAttr" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -334,21 +334,21 @@
     
     <!-- Methods for ContentAssocType -->
     <simple-method method-name="createContentAssocType" short-description="Create Content AssocType">
-        <make-value entity-name="ContentAssocType" value-name="newEntity"/>
+        <make-value entity-name="ContentAssocType" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result map-name="newEntity" field-name="contentAssocTypeId" />
     </simple-method>
     <simple-method method-name="updateContentAssocType" short-description="Update Content AssocType">
-        <make-value entity-name="ContentAssocType" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAssocType" short-description="Remove Content AssocType">
-        <make-value entity-name="ContentAssocType" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -356,7 +356,7 @@
     
     <!-- Methods for ContentPurposeType -->
     <simple-method method-name="createContentPurposeType" short-description="Create Content PurposeType">
-        <make-value entity-name="ContentPurposeType" value-name="newEntity"/>
+        <make-value entity-name="ContentPurposeType" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
  <if-empty field="newEntity.contentPurposeTypeId">
@@ -366,14 +366,14 @@
         <field-to-result map-name="newEntity" field-name="contentPurposeTypeId" />
     </simple-method>
     <simple-method method-name="updateContentPurposeType" short-description="Update Content PurposeType">
-        <make-value entity-name="ContentPurposeType" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeType" short-description="Remove Content PurposeType">
-        <make-value entity-name="ContentPurposeType" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -381,21 +381,21 @@
     
     <!-- Methods for ContentAssocPredicate -->
     <simple-method method-name="createContentAssocPredicate" short-description="Create Content AssocPredicate">
-        <make-value entity-name="ContentAssocPredicate" value-name="newEntity"/>
+        <make-value entity-name="ContentAssocPredicate" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result map-name="newEntity" field-name="contentAssocPredicateId" />
     </simple-method>
     <simple-method method-name="updateContentAssocPredicate" short-description="Update Content AssocPredicate">
-        <make-value entity-name="ContentAssocPredicate" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAssocPredicate" short-description="Remove Content AssocPredicate">
-        <make-value entity-name="ContentAssocPredicate" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -403,20 +403,20 @@
     
     <!-- Methods for ContentPurposeOperation -->
     <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-name="newEntity"/>
+        <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -424,20 +424,20 @@
     
     <!-- Methods for ContentPurpose -->
     <simple-method method-name="createContentPurpose" short-description="Create Content Purpose">
-        <make-value entity-name="ContentPurpose" value-name="newEntity"/>
+        <make-value entity-name="ContentPurpose" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentPurpose" short-description="Update Content Purpose">
-        <make-value entity-name="ContentPurpose" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurpose" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurpose" short-description="Remove Content Purpose">
-        <make-value entity-name="ContentPurpose" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurpose" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -450,20 +450,20 @@
     
     <!-- Methods for ContentOperation -->
     <simple-method method-name="createContentOperation" short-description="Create Content Operation">
-        <make-value entity-name="ContentOperation" value-name="newEntity"/>
+        <make-value entity-name="ContentOperation" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentOperation" short-description="Update Content Operation">
-        <make-value entity-name="ContentOperation" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentOperation" short-description="Remove Content Operation">
-        <make-value entity-name="ContentOperation" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -471,20 +471,20 @@
     
     <!-- Methods for ContentPurposeOperation -->
     <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-name="newEntity"/>
+        <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -492,20 +492,20 @@
     
     <!-- Methods for ContentAttribute -->
     <simple-method method-name="createContentAttribute" short-description="Create Content Attribute">
-        <make-value entity-name="ContentAttribute" value-name="newEntity"/>
+        <make-value entity-name="ContentAttribute" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentAttribute" short-description="Update Content Attribute">
-        <make-value entity-name="ContentAttribute" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAttribute" short-description="Remove Content Attribute">        
-        <make-value entity-name="ContentAttribute" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -513,13 +513,13 @@
     
     <!-- Methods for ContentMetaData -->
     <simple-method method-name="createContentMetaData" short-description="Create Content MetaData">
-        <make-value entity-name="ContentMetaData" value-name="newEntity"/>
+        <make-value entity-name="ContentMetaData" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentMetaData" short-description="Update Content MetaData">
-        <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -527,7 +527,7 @@
     </simple-method>
     <simple-method method-name="removeContentMetaData" short-description="Remove Content MetaData">        
         <check-errors/>
-        <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
+        <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -560,11 +560,11 @@
         <set from-field="parameters.contentId" field="queryMap.contentId"/>
         <set field="mapKeys" from-field="parameters.mapKeys" />
         <field-to-list field-name="mapKey" list-name="mapKeys"/>
-        <iterate entry="mapKey" list-name="mapKeys">
+        <iterate entry="mapKey" list="mapKeys">
             <set from-field="mapKey" field="queryMap.mapKey"/>
             <find-by-and list-name="resultMap" entity-name="ContentAssoc" map-name="queryMap"/>
             <filter-list-by-date list-name="resultMap" to-list-name="validContent"/>
-            <iterate entry="contentAssoc" list-name="validContent">
+            <iterate entry="contentAssoc" list="validContent">
                 <field-to-list field-name="contentAssoc" list-name="result"/>
             </iterate>
         </iterate>
@@ -715,7 +715,7 @@
         </if-not-empty>
     </simple-method>
     <simple-method method-name="createTopic" short-description="Create TOPIC type Content">
-        <make-value value-name="content" entity-name="Content" />
+        <make-value value-field="content" entity-name="Content" />
         <set from-field="parameters.newTopicId" field="content.contentId" />
         <set from-field="parameters.newTopicId" field="content.contentName" />
         <set from-field="parameters.newTopicDescription" field="content.description" />
@@ -840,7 +840,7 @@
  <!-- This service ties CommunicationEvent and Content entities together along with the standard from/thruDate fields.
  -->
     <simple-method method-name="createCommEventContentAssoc" short-description="Create CommEventContentAssoc">
- <make-value entity-name="CommEventContentAssoc" value-name="commEventContentAssoc" />
+ <make-value entity-name="CommEventContentAssoc" value-field="commEventContentAssoc" />
  <set-pk-fields value-name="commEventContentAssoc" map-name="parameters"/>
  <set-nonpk-fields value-name="commEventContentAssoc" map-name="parameters"/>
  <if-empty field="commEventContentAssoc.fromDate">
@@ -853,7 +853,7 @@
  <!-- This service would primarily be used to update the thruDate field.
  -->
     <simple-method method-name="updateCommEventContentAssoc" short-description="Create CommEventContentAssoc">
- <make-value entity-name="CommEventContentAssoc" value-name="pkCommEventContentAssoc" />
+ <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc" />
  <set-pk-fields value-name="pkCommEventContentAssoc" map-name="parameters"/>
  <find-by-primary-key value-name="commEventContentAssoc" map-name="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/>
  <if-empty field="commEventContentAssoc">
@@ -866,7 +866,7 @@
  </simple-method>
     
     <simple-method method-name="removeCommEventContentAssoc" short-description="Delete CommEventContentAssoc">
-        <make-value entity-name="CommEventContentAssoc" value-name="pkCommEventContentAssoc" />
+        <make-value entity-name="CommEventContentAssoc" value-field="pkCommEventContentAssoc" />
         <set-pk-fields value-name="pkCommEventContentAssoc" map-name="parameters"/>
         <find-by-primary-key value-name="commEventContentAssoc" map-name="pkCommEventContentAssoc" entity-name="CommEventContentAssoc"/>
         <if-empty field="commEventContentAssoc">
@@ -1161,7 +1161,7 @@
           </condition-list>
         </entity-condition>
         
-        <iterate entry="view" list-name="viewList">
+        <iterate entry="view" list="viewList">
             <set field="hasPermission" value="true" type="Boolean"/>
             <if>
                 <condition>
@@ -1200,7 +1200,7 @@
             <result-to-field result-name="subContentList"/>
         </call-service>        
         
-        <iterate entry="view" list-name="subContentList">
+        <iterate entry="view" list="subContentList">
         <entity-condition list-name="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}">
           <condition-list combine="and">
               <condition-expr field-name="contentIdStart" env-name="view.caContentIdTo"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 03:28:24 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
   <!-- Methods for DataResource -->
     <simple-method method-name="createDataResource" short-description="Create a Data Resource">
-        <make-value entity-name="DataResource" value-name="newEntity"/>
+        <make-value entity-name="DataResource" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -56,7 +56,7 @@
     </simple-method>
 
     <simple-method method-name="updateDataResource" short-description="Update a Data Resource">
-        <make-value entity-name="DataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
 
@@ -72,7 +72,7 @@
     </simple-method>
 
     <simple-method method-name="deleteDataResource" short-description="Delete a Data Resource">        
-        <make-value entity-name="DataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -80,7 +80,7 @@
 
   <!-- Methods for DataCategory -->
     <simple-method method-name="createDataCategory" short-description="Create a Data Category">
-        <make-value entity-name="DataCategory" value-name="newEntity"/>
+        <make-value entity-name="DataCategory" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -88,14 +88,14 @@
         <field-to-result field-name="dataCategoryId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataCategory" short-description="Update a Data Category">
-        <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteDataCategory" short-description="Delete a Data Category">
-        <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -106,7 +106,7 @@
         <check-permission permission="CONTENTMGR" action="_CREATE"><fail-message message="Security Error: to run createDataResourceMetaData you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="DataResourceMetaData" value-name="newEntity"/>
+        <make-value entity-name="DataResourceMetaData" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -115,7 +115,7 @@
         <check-permission permission="CONTENTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateDataResourceMetaData you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="DataResourceMetaData" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -125,7 +125,7 @@
         <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run removeDataResourceMetaData you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="DataResourceMetaData" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -136,7 +136,7 @@
         <check-permission permission="CONTENTMGR" action="_CREATE"><fail-message message="Security Error: to run createDataResourcePurpose you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="DataResourcePurpose" value-name="newEntity"/>
+        <make-value entity-name="DataResourcePurpose" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
@@ -145,7 +145,7 @@
         <check-permission permission="CONTENTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateDataResourcePurpose you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="DataResourcePurpose" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourcePurpose" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourcePurpose" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
@@ -155,7 +155,7 @@
         <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run removeDataResourcePurpose you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
         <check-errors/>
 
-        <make-value entity-name="DataResourcePurpose" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourcePurpose" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourcePurpose" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -163,7 +163,7 @@
     
   <!-- Methods for DataResourceRole -->
     <simple-method method-name="createDataResourceRole" short-description="Create Data Resource Role">
-        <make-value entity-name="DataResourceRole" value-name="newEntity"/>
+        <make-value entity-name="DataResourceRole" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -175,14 +175,14 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataResourceRole" short-description="Update Data Resource Role">
-        <make-value entity-name="DataResourceRole" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceRole" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceRole" short-description="Remove Data Resource Role">        
-        <make-value entity-name="DataResourceRole" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceRole" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -190,21 +190,21 @@
     
   <!-- Methods for DataCategory -->
     <simple-method method-name="createDataCategory" short-description="Create Data Category">
-        <make-value entity-name="DataCategory" value-name="newEntity"/>
+        <make-value entity-name="DataCategory" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="dataCategoryId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataCategory" short-description="Update Data Category">
-        <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataCategory" short-description="Remove Data DateCategory">      
-        <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -212,21 +212,21 @@
 
     <!-- Methods for DataResourceType -->
     <simple-method method-name="createDataResourceType" short-description="Create Data Resource Type">
-        <make-value entity-name="DataResourceType" value-name="newEntity"/>
+        <make-value entity-name="DataResourceType" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="dataResourceTypeId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataResourceType" short-description="Update Data Resource Type">
-        <make-value entity-name="DataResourceType" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceType" short-description="Remove Data Resource Type">
-        <make-value entity-name="DataResourceType" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -234,20 +234,20 @@
     
     <!-- Methods for DataResourceAttribute -->
     <simple-method method-name="createDataResourceAttribute" short-description="Create Data Resource Attribute">
-        <make-value entity-name="DataResourceAttribute" value-name="newEntity"/>
+        <make-value entity-name="DataResourceAttribute" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataResourceAttribute" short-description="Update Data Resource Attribute">
-        <make-value entity-name="DataResourceAttribute" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceAttribute" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceAttribute" short-description="Remove Data Resource Attribute">        
-        <make-value entity-name="DataResourceAttribute" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceAttribute" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -255,20 +255,20 @@
   
     <!-- Methods for DataResourceTypeAttr -->
     <simple-method method-name="createDataResourceTypeAttr" short-description="Create Data Resource Type Attribute">
-        <make-value entity-name="DataResourceTypeAttr" value-name="newEntity"/>
+        <make-value entity-name="DataResourceTypeAttr" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataResourceTypeAttr" short-description="Update Data Resource Type Attribute">
-        <make-value entity-name="DataResourceTypeAttr" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceTypeAttr" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceTypeAttr" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceTypeAttr" short-description="Remove Data Resource Type Attribute">        
-        <make-value entity-name="DataResourceTypeAttr" value-name="lookupKeyValue"/>
+        <make-value entity-name="DataResourceTypeAttr" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceTypeAttr" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -276,21 +276,21 @@
     
     <!-- Methods for CharacterSet -->
     <simple-method method-name="createCharacterSet" short-description="Create Character Set">
-        <make-value entity-name="CharacterSet" value-name="newEntity"/>
+        <make-value entity-name="CharacterSet" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="characterSetId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateCharacterSet" short-description="Update Character Set">
-        <make-value entity-name="CharacterSet" value-name="lookupKeyValue"/>
+        <make-value entity-name="CharacterSet" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="CharacterSet" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeCharacterSet" short-description="Remove Character Set">
-        <make-value entity-name="CharacterSet" value-name="lookupKeyValue"/>
+        <make-value entity-name="CharacterSet" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="CharacterSet" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -298,21 +298,21 @@
     
     <!-- Methods for FileExtension -->
     <simple-method method-name="createFileExtension" short-description="Create Data Resource Role">
-        <make-value entity-name="FileExtension" value-name="newEntity"/>
+        <make-value entity-name="FileExtension" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="fileExtensionId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateFileExtension" short-description="Update Data Resource Role">
-        <make-value entity-name="FileExtension" value-name="lookupKeyValue"/>
+        <make-value entity-name="FileExtension" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="FileExtension" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeFileExtension" short-description="Remove Data Resource Role">
-        <make-value entity-name="FileExtension" value-name="lookupKeyValue"/>
+        <make-value entity-name="FileExtension" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="FileExtension" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -320,21 +320,21 @@
     
     <!-- Methods for MetaDataPredicate -->
     <simple-method method-name="createMetaDataPredicate" short-description="Create Data Resource Role">
-        <make-value entity-name="MetaDataPredicate" value-name="newEntity"/>
+        <make-value entity-name="MetaDataPredicate" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="metaDataPredicateId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateMetaDataPredicate" short-description="Update Data Resource Role">
-        <make-value entity-name="MetaDataPredicate" value-name="lookupKeyValue"/>
+        <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MetaDataPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeMetaDataPredicate" short-description="Remove Data Resource Role">
-        <make-value entity-name="MetaDataPredicate" value-name="lookupKeyValue"/>
+        <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MetaDataPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -342,21 +342,21 @@
     
     <!-- Methods for MimeType -->
     <simple-method method-name="createMimeType" short-description="Create MimeType">
-        <make-value entity-name="MimeType" value-name="newEntity"/>
+        <make-value entity-name="MimeType" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="mimeTypeId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateMimeType" short-description="Update MimeType">
-        <make-value entity-name="MimeType" value-name="lookupKeyValue"/>
+        <make-value entity-name="MimeType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeMimeType" short-description="Remove MimeType">        
-        <make-value entity-name="MimeType" value-name="lookupKeyValue"/>
+        <make-value entity-name="MimeType" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -364,20 +364,20 @@
 
     <!-- Methods for MimeTypeHtmlTemplate -->
     <simple-method method-name="createMimeTypeHtmlTemplate" short-description="Create MimeTypeHtmlTemplate">
-        <make-value entity-name="MimeTypeHtmlTemplate" value-name="newEntity"/>
+        <make-value entity-name="MimeTypeHtmlTemplate" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>        
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateMimeTypeHtmlTemplate" short-description="Update MimeTypeHtmlTemplate">
-        <make-value entity-name="MimeTypeHtmlTemplate" value-name="lookupKeyValue"/>
+        <make-value entity-name="MimeTypeHtmlTemplate" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeTypeHtmlTemplate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeMimeTypeHtmlTemplate" short-description="Remove MimeTypeHtmlTemplate">
-        <make-value entity-name="MimeTypeHtmlTemplate" value-name="lookupKeyValue"/>
+        <make-value entity-name="MimeTypeHtmlTemplate" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeTypeHtmlTemplate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -385,7 +385,7 @@
 
     <!-- Methods for ElectronicText -->
     <simple-method method-name="createElectronicText" short-description="Create Electronic Text">
-        <make-value entity-name="ElectronicText" value-name="newEntity"/>
+        <make-value entity-name="ElectronicText" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
 
@@ -394,7 +394,7 @@
     </simple-method>
 
     <simple-method method-name="updateElectronicText" short-description="Update Electronic Text">
-        <make-value entity-name="ElectronicText" value-name="lookupKeyValue"/>
+        <make-value entity-name="ElectronicText" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ElectronicText" map-name="lookupKeyValue" value-name="lookedUpValue"/>
 
@@ -403,7 +403,7 @@
         <field-to-result field-name="dataResourceId" map-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeElectronicText" short-description="Remove Electronic Text">
-        <make-value entity-name="ElectronicText" value-name="lookupKeyValue"/>
+        <make-value entity-name="ElectronicText" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         
         <find-by-primary-key entity-name="ElectronicText" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -412,20 +412,20 @@
 
     <!-- Methods for ImageDataResource -->
     <simple-method method-name="createImageDataResource" short-description="Create Image Data Resource">
-        <make-value entity-name="ImageDataResource" value-name="newEntity"/>
+        <make-value entity-name="ImageDataResource" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateImageDataResource" short-description="Update Image Data Resource">
-        <make-value entity-name="ImageDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="ImageDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ImageDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeImageDataResource" short-description="Remove Image Data Resource">
-        <make-value entity-name="ImageDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="ImageDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ImageDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -433,20 +433,20 @@
 
     <!-- Methods for VideoDataResource -->
     <simple-method method-name="createVideoDataResource" short-description="Create Video Data Resource">
-        <make-value entity-name="VideoDataResource" value-name="newEntity"/>
+        <make-value entity-name="VideoDataResource" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateVideoDataResource" short-description="Update Video Data Resource">
-        <make-value entity-name="VideoDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="VideoDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="VideoDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeVideoDataResource" short-description="Remove Video Data Resource">
-        <make-value entity-name="VideoDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="VideoDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="VideoDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -454,20 +454,20 @@
 
     <!-- Methods for AudioDataResource -->
     <simple-method method-name="createAudioDataResource" short-description="Create Audio Data Resource">
-        <make-value entity-name="AudioDataResource" value-name="newEntity"/>
+        <make-value entity-name="AudioDataResource" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateAudioDataResource" short-description="Update Audio Data Resource">
-        <make-value entity-name="AudioDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="AudioDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="AudioDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeAudioDataResource" short-description="Remove Audio Data Resource">
-        <make-value entity-name="AudioDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="AudioDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="AudioDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
@@ -475,21 +475,21 @@
 
     <!-- Methods for OtherDataResource -->
     <simple-method method-name="createOtherDataResource" short-description="Create Other Data Resource">
-        <make-value entity-name="OtherDataResource" value-name="newEntity"/>
+        <make-value entity-name="OtherDataResource" value-field="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <log level="always" message="created new OtherDataResource: ${newEntity}"/>
     </simple-method>
     <simple-method method-name="updateOtherDataResource" short-description="Update Other Data Resource">
-        <make-value entity-name="OtherDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="OtherDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="OtherDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeOtherDataResource" short-description="Remove Other Data Resource">        
-        <make-value entity-name="OtherDataResource" value-name="lookupKeyValue"/>
+        <make-value entity-name="OtherDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="OtherDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=730098&r1=730097&r2=730098&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Tue Dec 30 03:28:24 2008
@@ -25,7 +25,7 @@
         <log level="always" message="in createLayout."/>
         <log level="always" message="parameters: ${parameters}"/>
 
-        <make-value entity-name="Content" value-name="currentContent"/>
+        <make-value entity-name="Content" value-field="currentContent"/>
         <set-pk-fields map-name="parameters" value-name="currentContent"/>
         <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
         <map-to-map map-name="currentContent" to-map-name="context"/>
@@ -55,7 +55,7 @@
         <log level="always" message="in updateLayout."/>
         <log level="always" message="parameters: ${parameters}"/>
 
-        <make-value entity-name="Content" value-name="currentContent"/>
+        <make-value entity-name="Content" value-field="currentContent"/>
         <set-pk-fields map-name="parameters" value-name="currentContent"/>
         <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
         <set field="context.currentContent" from-field="currentContent"/>
@@ -134,7 +134,7 @@
         </if-not-empty>
 
         <!-- add to most recently used list --><!--
-        <make-value entity-name="SubContentDataResourceView" value-name="subContent"/>
+        <make-value entity-name="SubContentDataResourceView" value-field="subContent"/>
         <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId" />
         <field-to-field field-name="dataResourceId" to-map-name="subContent" to-field-name="drDataResourceId"/>
         <log level="always" message="subContent: ${subContent}"/>
@@ -230,7 +230,7 @@
         </if-not-empty>
 
         <!-- add to most recently used list --><!--
-        <make-value entity-name="SubContentDataResourceView" value-name="subContent"/>
+        <make-value entity-name="SubContentDataResourceView" value-field="subContent"/>
         <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId" />
         <field-to-field field-name="dataResourceId" to-map-name="subContent" to-field-name="drDataResourceId"/>
         <log level="always" message="subContent: ${subContent}"/>
@@ -288,7 +288,7 @@
         </if-not-empty>
 
         <!-- add to most recently used list --><!--
-        <make-value entity-name="SubContentDataResourceView" value-name="subContent"/>
+        <make-value entity-name="SubContentDataResourceView" value-field="subContent"/>
         <field-to-field field-name="contentId" to-map-name="subContent" to-field-name="contentId" />
         <field-to-field field-name="dataResourceId" to-map-name="subContent" to-field-name="drDataResourceId"/>
         <log level="always" message="subContent: ${subContent}"/>