svn commit: r730107 [2/5] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accountin...

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

svn commit: r730107 [2/5] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accountin...

jleroux@apache.org
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=730107&r1=730106&r2=730107&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:59:10 2008
@@ -24,7 +24,7 @@
     <!-- base content CRUD services -->
     <simple-method method-name="createContent" short-description="Create a Content Record">
         <make-value value-field="content" entity-name="Content"/>
-        <set-nonpk-fields value-name="content" map-name="parameters"/>
+        <set-nonpk-fields value-field="content" map="parameters"/>
         <set-pk-fields value-field="content" map="parameters"/>
 
         <if-empty field="content.contentId">
@@ -54,7 +54,7 @@
     </simple-method>
     <simple-method method-name="updateContent" short-description="Update a Content Record">
         <entity-one entity-name="Content" value-name="content" auto-field-map="true"/>
-        <set-nonpk-fields value-name="content" map-name="parameters"/>
+        <set-nonpk-fields value-field="content" map="parameters"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
@@ -74,7 +74,7 @@
     <!-- content assoc services -->
     <simple-method method-name="createContentAssoc" short-description="Create a ContntAssoc Record">
         <make-value value-field="assoc" entity-name="ContentAssoc"/>
-        <set-nonpk-fields value-name="assoc" map-name="parameters"/>
+        <set-nonpk-fields value-field="assoc" map="parameters"/>
         <set-pk-fields value-field="assoc" map="parameters"/>
         <set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" />
 
@@ -95,7 +95,7 @@
     <simple-method method-name="updateContentAssoc" short-description="Update a ContentAssoc Record">
         <set field="contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" />
         <entity-one entity-name="ContentAssoc" value-name="assoc" auto-field-map="true"/>
-        <set-nonpk-fields value-name="assoc" map-name="parameters"/>
+        <set-nonpk-fields value-field="assoc" map="parameters"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
@@ -228,7 +228,7 @@
     <!-- Methods for ContentMetaData -->
     <simple-method method-name="createContentMetaData" short-description="Create Content Meta Data">
         <make-value entity-name="ContentMetaData" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -236,7 +236,7 @@
         <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentMetaData" short-description="Remove Content Meta Data">        
@@ -264,7 +264,7 @@
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <find-by-primary-key entity-name="ContentRole" map="newEntity" value-field="contentRole"/>
         <if-empty field="contentRole">
-            <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+            <set-nonpk-fields map="parameters" value-field="newEntity"/>
             <create-value value-name="newEntity"/>
         </if-empty>
         <check-errors/>
@@ -273,7 +273,7 @@
         <make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRole" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deactivateAllContentRoles" short-description="Update Content Role">                        
@@ -299,7 +299,7 @@
   <!-- Methods for ContentType -->
     <simple-method method-name="createContentType" short-description="Create Content Type">
         <make-value entity-name="ContentType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result map-name="newEntity" field-name="contentTypeId" />
@@ -308,7 +308,7 @@
         <make-value entity-name="ContentType" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentType" short-description="Remove Content Type">
@@ -321,7 +321,7 @@
     <!-- Methods for ContentTypeAttr -->
     <simple-method method-name="createContentTypeAttr" short-description="Create Content TypeAttr">
         <make-value entity-name="ContentTypeAttr" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -335,7 +335,7 @@
     <!-- Methods for ContentAssocType -->
     <simple-method method-name="createContentAssocType" short-description="Create Content AssocType">
         <make-value entity-name="ContentAssocType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result map-name="newEntity" field-name="contentAssocTypeId" />
@@ -344,7 +344,7 @@
         <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAssocType" short-description="Remove Content AssocType">
@@ -357,7 +357,7 @@
     <!-- Methods for ContentPurposeType -->
     <simple-method method-name="createContentPurposeType" short-description="Create Content PurposeType">
         <make-value entity-name="ContentPurposeType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
  <if-empty field="newEntity.contentPurposeTypeId">
  <make-next-seq-id seq-field-name="contentPurposeTypeId" value-name="newEntity"/>
@@ -369,7 +369,7 @@
         <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeType" short-description="Remove Content PurposeType">
@@ -382,7 +382,7 @@
     <!-- Methods for ContentAssocPredicate -->
     <simple-method method-name="createContentAssocPredicate" short-description="Create Content AssocPredicate">
         <make-value entity-name="ContentAssocPredicate" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result map-name="newEntity" field-name="contentAssocPredicateId" />
@@ -391,7 +391,7 @@
         <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocPredicate" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAssocPredicate" short-description="Remove Content AssocPredicate">
@@ -404,7 +404,7 @@
     <!-- Methods for ContentPurposeOperation -->
     <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
         <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -412,7 +412,7 @@
         <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
@@ -425,7 +425,7 @@
     <!-- Methods for ContentPurpose -->
     <simple-method method-name="createContentPurpose" short-description="Create Content Purpose">
         <make-value entity-name="ContentPurpose" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -433,7 +433,7 @@
         <make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurpose" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurpose" short-description="Remove Content Purpose">
@@ -451,7 +451,7 @@
     <!-- Methods for ContentOperation -->
     <simple-method method-name="createContentOperation" short-description="Create Content Operation">
         <make-value entity-name="ContentOperation" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -459,7 +459,7 @@
         <make-value entity-name="ContentOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentOperation" short-description="Remove Content Operation">
@@ -472,7 +472,7 @@
     <!-- Methods for ContentPurposeOperation -->
     <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
         <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -480,7 +480,7 @@
         <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
@@ -493,7 +493,7 @@
     <!-- Methods for ContentAttribute -->
     <simple-method method-name="createContentAttribute" short-description="Create Content Attribute">
         <make-value entity-name="ContentAttribute" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -501,7 +501,7 @@
         <make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAttribute" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAttribute" short-description="Remove Content Attribute">        
@@ -514,7 +514,7 @@
     <!-- Methods for ContentMetaData -->
     <simple-method method-name="createContentMetaData" short-description="Create Content MetaData">
         <make-value entity-name="ContentMetaData" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -522,7 +522,7 @@
         <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentMetaData" short-description="Remove Content MetaData">        
@@ -842,7 +842,7 @@
     <simple-method method-name="createCommEventContentAssoc" short-description="Create CommEventContentAssoc">
  <make-value entity-name="CommEventContentAssoc" value-field="commEventContentAssoc" />
  <set-pk-fields value-field="commEventContentAssoc" map="parameters"/>
- <set-nonpk-fields value-name="commEventContentAssoc" map-name="parameters"/>
+ <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/>
  <if-empty field="commEventContentAssoc.fromDate">
  <now-timestamp-to-env env-name="commEventContentAssoc.fromDate"/>
  </if-empty>
@@ -861,7 +861,7 @@
  <fail-message message="CommEventContentAssoc entity not found for update, communicationEventId: ${parameters.communicationEventId} and contentId: ${parameters.contentId}"/>
  </add-error>
  </if-empty>
- <set-nonpk-fields value-name="commEventContentAssoc" map-name="parameters"/>
+ <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/>
  <store-value value-name="commEventContentAssoc" />
  </simple-method>
     

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=730107&r1=730106&r2=730107&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:59:10 2008
@@ -23,7 +23,7 @@
   <!-- Methods for DataResource -->
     <simple-method method-name="createDataResource" short-description="Create a Data Resource">
         <make-value entity-name="DataResource" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="newEntity.dataResourceId">
@@ -61,7 +61,7 @@
         <find-by-primary-key entity-name="DataResource" map="lookupKeyValue" value-field="lookedUpValue"/>
 
         <to-string map-name="parameters" field-name="locale" />
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
@@ -81,7 +81,7 @@
   <!-- Methods for DataCategory -->
     <simple-method method-name="createDataCategory" short-description="Create a Data Category">
         <make-value entity-name="DataCategory" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <create-value value-name="newEntity"/>
@@ -91,7 +91,7 @@
         <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteDataCategory" short-description="Delete a Data Category">
@@ -107,7 +107,7 @@
         <check-errors/>
 
         <make-value entity-name="DataResourceMetaData" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -118,7 +118,7 @@
         <make-value entity-name="DataResourceMetaData" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceMetaData" short-description="Remove Data Resource Meta Data">
@@ -137,7 +137,7 @@
         <check-errors/>
 
         <make-value entity-name="DataResourcePurpose" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -148,7 +148,7 @@
         <make-value entity-name="DataResourcePurpose" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourcePurpose" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourcePurpose" short-description="Remove Data Resource Purpose">
@@ -164,7 +164,7 @@
   <!-- Methods for DataResourceRole -->
     <simple-method method-name="createDataResourceRole" short-description="Create Data Resource Role">
         <make-value entity-name="DataResourceRole" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="newEntity.fromDate">
@@ -178,7 +178,7 @@
         <make-value entity-name="DataResourceRole" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceRole" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceRole" short-description="Remove Data Resource Role">        
@@ -191,7 +191,7 @@
   <!-- Methods for DataCategory -->
     <simple-method method-name="createDataCategory" short-description="Create Data Category">
         <make-value entity-name="DataCategory" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="dataCategoryId" map-name="newEntity"/>
@@ -200,7 +200,7 @@
         <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataCategory" short-description="Remove Data DateCategory">      
@@ -213,7 +213,7 @@
     <!-- Methods for DataResourceType -->
     <simple-method method-name="createDataResourceType" short-description="Create Data Resource Type">
         <make-value entity-name="DataResourceType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="dataResourceTypeId" map-name="newEntity"/>
@@ -222,7 +222,7 @@
         <make-value entity-name="DataResourceType" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceType" short-description="Remove Data Resource Type">
@@ -235,7 +235,7 @@
     <!-- Methods for DataResourceAttribute -->
     <simple-method method-name="createDataResourceAttribute" short-description="Create Data Resource Attribute">
         <make-value entity-name="DataResourceAttribute" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -243,7 +243,7 @@
         <make-value entity-name="DataResourceAttribute" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceAttribute" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceAttribute" short-description="Remove Data Resource Attribute">        
@@ -256,7 +256,7 @@
     <!-- Methods for DataResourceTypeAttr -->
     <simple-method method-name="createDataResourceTypeAttr" short-description="Create Data Resource Type Attribute">
         <make-value entity-name="DataResourceTypeAttr" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -264,7 +264,7 @@
         <make-value entity-name="DataResourceTypeAttr" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceTypeAttr" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeDataResourceTypeAttr" short-description="Remove Data Resource Type Attribute">        
@@ -277,7 +277,7 @@
     <!-- Methods for CharacterSet -->
     <simple-method method-name="createCharacterSet" short-description="Create Character Set">
         <make-value entity-name="CharacterSet" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="characterSetId" map-name="newEntity"/>
@@ -286,7 +286,7 @@
         <make-value entity-name="CharacterSet" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="CharacterSet" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeCharacterSet" short-description="Remove Character Set">
@@ -299,7 +299,7 @@
     <!-- Methods for FileExtension -->
     <simple-method method-name="createFileExtension" short-description="Create Data Resource Role">
         <make-value entity-name="FileExtension" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="fileExtensionId" map-name="newEntity"/>
@@ -308,7 +308,7 @@
         <make-value entity-name="FileExtension" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="FileExtension" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeFileExtension" short-description="Remove Data Resource Role">
@@ -321,7 +321,7 @@
     <!-- Methods for MetaDataPredicate -->
     <simple-method method-name="createMetaDataPredicate" short-description="Create Data Resource Role">
         <make-value entity-name="MetaDataPredicate" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="metaDataPredicateId" map-name="newEntity"/>
@@ -330,7 +330,7 @@
         <make-value entity-name="MetaDataPredicate" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="MetaDataPredicate" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeMetaDataPredicate" short-description="Remove Data Resource Role">
@@ -343,7 +343,7 @@
     <!-- Methods for MimeType -->
     <simple-method method-name="createMimeType" short-description="Create MimeType">
         <make-value entity-name="MimeType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="mimeTypeId" map-name="newEntity"/>
@@ -352,7 +352,7 @@
         <make-value entity-name="MimeType" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeMimeType" short-description="Remove MimeType">        
@@ -365,7 +365,7 @@
     <!-- Methods for MimeTypeHtmlTemplate -->
     <simple-method method-name="createMimeTypeHtmlTemplate" short-description="Create MimeTypeHtmlTemplate">
         <make-value entity-name="MimeTypeHtmlTemplate" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>        
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -373,7 +373,7 @@
         <make-value entity-name="MimeTypeHtmlTemplate" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeTypeHtmlTemplate" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeMimeTypeHtmlTemplate" short-description="Remove MimeTypeHtmlTemplate">
@@ -386,7 +386,7 @@
     <!-- Methods for ElectronicText -->
     <simple-method method-name="createElectronicText" short-description="Create Electronic Text">
         <make-value entity-name="ElectronicText" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
         <create-value value-name="newEntity"/>
@@ -398,7 +398,7 @@
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ElectronicText" map="lookupKeyValue" value-field="lookedUpValue"/>
 
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
         <field-to-result field-name="dataResourceId" map-name="lookedUpValue"/>
     </simple-method>
@@ -413,7 +413,7 @@
     <!-- Methods for ImageDataResource -->
     <simple-method method-name="createImageDataResource" short-description="Create Image Data Resource">
         <make-value entity-name="ImageDataResource" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -421,7 +421,7 @@
         <make-value entity-name="ImageDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ImageDataResource" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeImageDataResource" short-description="Remove Image Data Resource">
@@ -434,7 +434,7 @@
     <!-- Methods for VideoDataResource -->
     <simple-method method-name="createVideoDataResource" short-description="Create Video Data Resource">
         <make-value entity-name="VideoDataResource" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -442,7 +442,7 @@
         <make-value entity-name="VideoDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="VideoDataResource" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeVideoDataResource" short-description="Remove Video Data Resource">
@@ -455,7 +455,7 @@
     <!-- Methods for AudioDataResource -->
     <simple-method method-name="createAudioDataResource" short-description="Create Audio Data Resource">
         <make-value entity-name="AudioDataResource" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -463,7 +463,7 @@
         <make-value entity-name="AudioDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="AudioDataResource" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeAudioDataResource" short-description="Remove Audio Data Resource">
@@ -476,7 +476,7 @@
     <!-- Methods for OtherDataResource -->
     <simple-method method-name="createOtherDataResource" short-description="Create Other Data Resource">
         <make-value entity-name="OtherDataResource" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <log level="always" message="created new OtherDataResource: ${newEntity}"/>
@@ -485,7 +485,7 @@
         <make-value entity-name="OtherDataResource" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="OtherDataResource" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeOtherDataResource" short-description="Remove Other Data Resource">        

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=730107&r1=730106&r2=730107&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:59:10 2008
@@ -27,7 +27,7 @@
 
         <make-value entity-name="Content" value-field="currentContent"/>
         <set-pk-fields map="parameters" value-field="currentContent"/>
-        <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
+        <set-nonpk-fields map="parameters" value-field="currentContent"/>
         <map-to-map map-name="currentContent" to-map-name="context"/>
         <log level="always" message="context: ${context}"/>
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
@@ -57,7 +57,7 @@
 
         <make-value entity-name="Content" value-field="currentContent"/>
         <set-pk-fields map="parameters" value-field="currentContent"/>
-        <set-nonpk-fields map-name="parameters" value-name="currentContent"/>
+        <set-nonpk-fields map="parameters" value-field="currentContent"/>
         <set field="context.currentContent" from-field="currentContent"/>
         <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId"/>
         <string-to-list list-name="targetOperationList" string="CONTENT_CREATE"/>
@@ -74,13 +74,13 @@
         <check-errors/>
         <set field="content.contentId" from-field="parameters.contentId"/>
         <find-by-primary-key entity-name="Content" value-field="content" map="content"/>
-        <set-nonpk-fields map-name="parameters" value-name="content"/>
+        <set-nonpk-fields map="parameters" value-field="content"/>
         <log level="always" message="content: ${content}"/>
         <store-value value-name="content"/>
         <field-to-request map-name="content" field-name="contentId" request-name="contentId"/>
         <set field="dataResource.dataResourceId" from-field="parameters.dataResourceId"/>
         <find-by-primary-key entity-name="DataResource" value-field="dataResource" map="dataResource"/>
-        <set-nonpk-fields map-name="parameters" value-name="dataResource"/>
+        <set-nonpk-fields map="parameters" value-field="dataResource"/>
         <set field="dataResource.objectInfo" from-field="parameters.drObjectInfo"/>
         <log level="always" message="dataResource: ${dataResource}"/>
         <store-value value-name="dataResource"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Dec 30 03:59:10 2008
@@ -24,21 +24,21 @@
     <!-- WebSite Services -->
     <simple-method method-name="createWebSite" short-description="Create a WebSite">
         <make-value value-field="newEntity" entity-name="WebSite"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateWebSite" short-description="Update a WebSite">
         <entity-one entity-name="WebSite" value-name="webSite"/>
-        <set-nonpk-fields map-name="parameters" value-name="webSite"/>
+        <set-nonpk-fields map="parameters" value-field="webSite"/>
         <store-value value-name="webSite"/>
     </simple-method>
     <simple-method method-name="removeWebSite" short-description="Remove a WebSite">
         <make-value value-field="lookupKeyValue" entity-name="WebSite"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="WebSite" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -46,7 +46,7 @@
     <simple-method method-name="createWebSiteContent" short-description="Create WebSite Content">
         <make-value value-field="newEntity" entity-name="WebSiteContent"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-field="newEntity" map="parameters"/>
         <if-empty field="newEntity.fromDate">
             <now-date-to-env env-name="nowTimestamp"/>
             <set field="newEntity.fromDate" from-field="nowTimestamp"/>
@@ -57,7 +57,7 @@
         <make-value value-field="lookupPKMap" entity-name="WebSiteContent"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="WebSiteContent" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeWebSiteContent" short-description="Remove WebSite Content">
@@ -71,7 +71,7 @@
     <simple-method method-name="createWebSiteContentType" short-description="Create WebSite Content Type">
         <make-value value-field="newEntity" entity-name="WebSiteContentType"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-field="newEntity" map="parameters"/>
         <if-empty field="newEntity.webSiteContentTypeId">
             <sequenced-id-to-env sequence-name="WebSiteContentTypeId" env-name="webSiteContentTypeId"/>
             <set field="newEntity.webSiteContentTypeId" from-field="webSiteContentTypeId"/>
@@ -82,7 +82,7 @@
         <make-value value-field="lookupPKMap" entity-name="WebSiteContentType"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="WebSiteContentType" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeWebSiteContentType" short-description="Remove WebSite Content Type">
@@ -96,14 +96,14 @@
     <simple-method method-name="createWebSitePathAlias" short-description="Create WebSite Path Alias">
         <make-value value-field="newEntity" entity-name="WebSitePathAlias"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-field="newEntity" map="parameters"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateWebSitePathAlias" short-description="Update WebSite Path Alias">
         <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeWebSitePathAlias" short-description="Remove WebSite Path Alias">
@@ -123,7 +123,7 @@
     <simple-method method-name="createWebSiteRole" short-description="Create WebSite Role">
         <make-value value-field="newEntity" entity-name="WebSiteRole"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -136,7 +136,7 @@
         <make-value value-field="lookupPKMap" entity-name="WebSiteRole"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="WebSiteRole" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeWebSiteRole" short-description="Remove WebSite Role">

Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 03:59:10 2008
@@ -29,7 +29,7 @@
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
         </if-empty>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <field-to-result field-name="newEntity.partyId" result-name="partyId"/>
         <field-to-result field-name="newEntity.partyQualTypeId" result-name="partyQualTypeId"/>
         <field-to-result field-name="newEntity.fromDate" result-name="fromDate"/>
@@ -39,7 +39,7 @@
     <!-- Ability Group -->    
      <simple-method method-name="updatePartyQual" short-description="Update Qualification of a Party">        
         <entity-one entity-name="PartyQual" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>        
     
@@ -50,7 +50,7 @@
     
     <simple-method method-name="createPartyResume" short-description="Create Resume for Party">                
         <make-value entity-name="PartyResume" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>                
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>                
         <sequenced-id-to-env sequence-name="PartyResume" env-name="newEntity.resumeId"/>        
         <field-to-result field-name="resumeId" result-name="resumeId"/>
         <create-value value-name="newEntity"/>
@@ -58,7 +58,7 @@
     
     <simple-method method-name="updatePartyResume" short-description="Update a Resume of a Party">        
         <entity-one entity-name="PartyResume" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>        
     
@@ -70,7 +70,7 @@
     <simple-method method-name="createPartySkill" short-description="Create Party Skills">
         <make-value entity-name="PartySkill" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <entity-one entity-name="PartySkill" value-name="partySkill" auto-field-map="true"/>
         <if>
             <condition>
@@ -93,7 +93,7 @@
         
     <simple-method method-name="updatePartySkill" short-description="Update Party Skills">        
         <entity-one entity-name="PartySkill" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -105,7 +105,7 @@
     <simple-method method-name="createPerfReview" short-description="Create a Performance Review">
         <make-value entity-name="PerfReview" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="PerfReview" env-name="newEntity.perfReviewId"/>
         <field-to-result field-name="perfReviewId" result-name="perfReviewId"/>
         <create-value value-name="newEntity"/>        
@@ -113,7 +113,7 @@
     
     <simple-method method-name="updatePerfReview" short-description="Update Performance Review">
         <entity-one entity-name="PerfReview" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
       
@@ -125,7 +125,7 @@
     <simple-method method-name="createPerfReviewItem" short-description="Create Performance Review Items">
         <make-value entity-name="PerfReviewItem" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>        
         <sequenced-id-to-env sequence-name="PerfReviewItem" env-name="newEntity.perfReviewItemSeqId"/>
         <field-to-result field-name="perfReviewItemSeqId" result-name="perfReviewItemSeqId"/>
         <create-value value-name="newEntity"/>
@@ -133,7 +133,7 @@
     
     <simple-method method-name="updatePerfReviewItem" short-description="Update Performance Review Items">        
         <entity-one entity-name="PerfReviewItem" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -145,7 +145,7 @@
     <simple-method method-name="createPerformanceNote" short-description="Create Performance Note">
         <make-value entity-name="PerformanceNote" value-field="newEntity"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -155,7 +155,7 @@
     
     <simple-method method-name="updatePerformanceNote" short-description="Update Performance Note">
         <entity-one entity-name="PerformanceNote" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -167,7 +167,7 @@
     <simple-method method-name="createPersonTraining" short-description="Create Person Training">          
         <make-value entity-name="PersonTraining" value-field="newEntity"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -177,7 +177,7 @@
         
     <simple-method method-name="updatePersonTraining" short-description="Update a Person Training">      
         <entity-one entity-name="PersonTraining" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -190,7 +190,7 @@
     <simple-method method-name="createEmployment" short-description="Create Employment">
         <make-value entity-name="Employment" value-field="newEntity"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -203,7 +203,7 @@
     
     <simple-method method-name="updateEmployment" short-description="Update Employment">
         <entity-one entity-name="Employment" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -214,7 +214,7 @@
         
     <simple-method method-name="createEmploymentApp" short-description="Create an Employment Application">
         <make-value entity-name="EmploymentApp" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>        
         <sequenced-id-to-env sequence-name="EmploymentApp" env-name="newEntity.applicationId"/>
         <field-to-result field-name="newEntity.applicationId" result-name="applicationId"/>        
         <create-value value-name="newEntity"/>
@@ -222,7 +222,7 @@
         
     <simple-method method-name="updateEmploymentApp" short-description="Update EmploymentApp">
         <entity-one entity-name="EmploymentApp" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -234,7 +234,7 @@
     <simple-method method-name="createPartyBenefit" short-description="Create Party Benefit">
         <make-value entity-name="PartyBenefit" value-field="newEntity"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -244,7 +244,7 @@
         
     <simple-method method-name="updatePartyBenefit" short-description="Update Party Benefit">
         <entity-one entity-name="PartyBenefit" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -258,7 +258,7 @@
         
     <simple-method method-name="createPayGrade" short-description="Create a Pay Grade">
         <make-value entity-name="PayGrade" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-not-empty field="parameters.payGradeId">
             <set field="newEntity.payGradeId" from-field="parameters.payGradeId"/>
         <else>
@@ -271,7 +271,7 @@
         
     <simple-method method-name="updatePayGrade" short-description="Update Pay Grade">
         <entity-one entity-name="PayGrade" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -283,7 +283,7 @@
     <simple-method method-name="createPayHistory" short-description="Create Pay History">
         <make-value entity-name="PayHistory" value-field="newEntity"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -293,7 +293,7 @@
         
     <simple-method method-name="updatePayHistory" short-description="Update Pay History">
         <entity-one entity-name="PayHistory" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
         
@@ -308,7 +308,7 @@
     <simple-method method-name="createPayrollPreference" short-description="Create a Payroll Preference">
         <make-value entity-name="PayrollPreference" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="PayrollPreference" env-name="newEntity.payrollPreferenceSeqId"/>
         <field-to-result field-name="payrollPreferenceSeqId" result-name="payrollPreferenceSeqId"/>
         <create-value value-name="newEntity"/>
@@ -316,7 +316,7 @@
     
     <simple-method method-name="updatePayrollPreference" short-description="Update Payroll Preference">
         <entity-one entity-name="PayrollPreference" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
       
@@ -328,7 +328,7 @@
     <simple-method method-name="createSalaryStep" short-description="Create a Salary Step">
         <make-value entity-name="SalaryStep" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>        
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>        
         <sequenced-id-to-env sequence-name="SalaryStep" env-name="newEntity.salaryStepSeqId"/>
         <field-to-result field-name="salaryStepSeqId" result-name="salaryStepSeqId"/>
         <create-value value-name="newEntity"/>
@@ -336,7 +336,7 @@
     
     <simple-method method-name="updateSalaryStep" short-description="Update Salary Step">
         <entity-one entity-name="SalaryStep" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -347,7 +347,7 @@
     
     <simple-method method-name="createTerminationReason" short-description="Create a Termination Reason">
         <make-value entity-name="TerminationReason" value-field="newEntity"/>        
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>              
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>              
         <sequenced-id-to-env sequence-name="TerminationReason" env-name="newEntity.terminationReasonId"/>
         <field-to-result field-name="newEntity.terminationReasonId" result-name="terminationReasonId"/>
         <create-value value-name="newEntity"/>        
@@ -355,7 +355,7 @@
     
     <simple-method method-name="updateTerminationReason" short-description="Update Termination Reason">
         <entity-one entity-name="TerminationReason" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -366,7 +366,7 @@
     
     <simple-method method-name="createUnemploymentClaim" short-description="Create a Unemployment Claim">
         <make-value entity-name="UnemploymentClaim" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="UnemploymentClaim" env-name="newEntity.unemploymentClaimId"/>
         <field-to-result field-name="newEntity.unemploymentClaimId" result-name="unemploymentClaimId"/>
         <create-value value-name="newEntity"/>        
@@ -374,7 +374,7 @@
     
     <simple-method method-name="updateUnemploymentClaim" short-description="Update Unemployment Claim">
         <entity-one entity-name="UnemploymentClaim" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -388,7 +388,7 @@
     <!-- Employee Position Group -->
     <simple-method method-name="createEmplPosition" short-description="Create a Employee Position">
         <make-value entity-name="EmplPosition" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>        
         <sequenced-id-to-env sequence-name="EmplPosition" env-name="newEntity.emplPositionId"/>        
         <field-to-result field-name="newEntity.emplPositionId" result-name="emplPositionId"/>
         <create-value value-name="newEntity"/>        
@@ -396,7 +396,7 @@
     
     <simple-method method-name="updateEmplPosition" short-description="Update Employee Position">
         <entity-one entity-name="EmplPosition" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -408,7 +408,7 @@
     <simple-method method-name="createEmplPositionFulfillment" short-description="Create a Emplyoee Position Fulfillment">
         <make-value entity-name="EmplPositionFulfillment" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -418,7 +418,7 @@
     
     <simple-method method-name="updateEmplPositionFulfillment" short-description="Update Employee Position Fulfillment">
         <entity-one entity-name="EmplPositionFulfillment" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -430,7 +430,7 @@
     <simple-method method-name="createEmplPositionReportingStruct" short-description="Create a Employee Position Reporting Structure">
         <make-value entity-name="EmplPositionReportingStruct" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -453,7 +453,7 @@
 
     <simple-method method-name="updateEmplPositionReportingStruct" short-description="Update Employee Position Reporting Structure">
         <entity-one entity-name="EmplPositionReportingStruct" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -465,7 +465,7 @@
     <simple-method method-name="createEmplPositionResponsibility" short-description="Create a Employee Position Responsibility">
         <make-value entity-name="EmplPositionResponsibility" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -475,7 +475,7 @@
     
     <simple-method method-name="updateEmplPositionResponsibility" short-description="Update Employee Position Responsibility">
         <entity-one entity-name="EmplPositionResponsibility" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -487,7 +487,7 @@
     <simple-method method-name="createValidResponsibility" short-description="Create a Valid Responsibility">
         <make-value entity-name="ValidResponsibility" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -497,7 +497,7 @@
     
     <simple-method method-name="updateValidResponsibility" short-description="Update Valid Responsibility">
         <entity-one entity-name="ValidResponsibility" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -508,7 +508,7 @@
     <!-- Skill Types -->
     <simple-method method-name="createSkillType" short-description="Create a SkillType">
         <make-value entity-name="SkillType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>        
         <sequenced-id-to-env sequence-name="SkillType" env-name="newEntity.skillTypeId"/>        
         <field-to-result field-name="newEntity.skillTypeId" result-name="skillTypeId"/>
         <create-value value-name="newEntity"/>        
@@ -516,7 +516,7 @@
     
     <simple-method method-name="updateSkillType" short-description="Update SkillType">
         <entity-one entity-name="SkillType" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -549,7 +549,7 @@
     <simple-method method-name="createResponsibilityType" short-description="Create a ResponsibilityType">
         <make-value entity-name="ResponsibilityType" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.responsibilityTypeId">
             <sequenced-id-to-env sequence-name="ResponsibilityType" env-name="newEntity.responsibilityTypeId"/>
         </if-empty>
@@ -559,7 +559,7 @@
     
     <simple-method method-name="updateResponsibilityType" short-description="Update ResponsibilityType">
         <entity-one entity-name="ResponsibilityType" value-name="lookedUpValue"/>
-        <set-nonpk-fields  map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields  map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -570,7 +570,7 @@
     
     <simple-method method-name="createTerminationType" short-description="Create a TerminationType">
         <make-value entity-name="TerminationType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.terminationTypeId">      
         <sequenced-id-to-env sequence-name="TerminationType" env-name="newEntity.terminationTypeId"/>
         </if-empty>        
@@ -580,7 +580,7 @@
     
     <simple-method method-name="updateTerminationType" short-description="Update TerminationType">
         <entity-one entity-name="TerminationType" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -591,7 +591,7 @@
     
     <simple-method method-name="createEmplPositionType" short-description="Create a PositionType">
         <make-value entity-name="EmplPositionType" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.emplPositionTypeId">      
             <sequenced-id-to-env sequence-name="EmplPositionType" env-name="newEntity.emplPositionTypeId"/>
         </if-empty>        
@@ -601,7 +601,7 @@
     
     <simple-method method-name="updateEmplPositionType" short-description="Update PositionType">
         <entity-one entity-name="EmplPositionType" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -621,7 +621,7 @@
         <make-value value-field="newEntity" entity-name="EmplPositionTypeRate"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         
         <if-not-empty field="parameters.rateAmount">
@@ -643,14 +643,14 @@
     <simple-method method-name="createAgreementEmploymentAppl" short-description="Create Agreement Employment Appl">
         <make-value entity-name="AgreementEmploymentAppl" value-field="agreementEmploymentAppl"/>
         <set-pk-fields value-field="agreementEmploymentAppl" map="parameters"/>
-        <set-nonpk-fields value-name="agreementEmploymentAppl" map-name="parameters"/>        
+        <set-nonpk-fields value-field="agreementEmploymentAppl" map="parameters"/>        
         <create-value value-name="agreementEmploymentAppl"/>
         <check-errors/>
     </simple-method>
     
     <simple-method method-name="updateAgreementEmploymentAppl" short-description="update an Agreement Employment Appl">
         <entity-one entity-name="AgreementEmploymentAppl" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
@@ -661,21 +661,21 @@
         <simple-method method-name="createEmplLeave" short-description="Create Employee Leave">
         <make-value entity-name="EmplLeave" value-field="newEntity"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-field="newEntity" map="parameters"/>
         <create-value value-name="newEntity"/>
         <check-errors/>
     </simple-method>
     
     <simple-method method-name="updateEmplLeave" short-description="Update Employee Leave">
         <entity-one entity-name="EmplLeave" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     
     <simple-method method-name="createEmplLeaveType" short-description="Create a LeaveType">
         <make-value entity-name="EmplLeaveType" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.leaveTypeId">
             <sequenced-id-to-env sequence-name="EmplLeaveType" env-name="newEntity.leaveTypeId"/>
         </if-empty>        
@@ -685,7 +685,7 @@
     
     <simple-method method-name="updateEmplLeaveType" short-description="Update leaveType">
         <entity-one entity-name="EmplLeaveType" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     

Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml Tue Dec 30 03:59:10 2008
@@ -43,7 +43,7 @@
             <else>
                 <make-value value-field="newEntity" entity-name="TechDataCalendar"/>
                 <set-pk-fields map="parameters" value-field="newEntity"/>
-                <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+                <set-nonpk-fields map="parameters" value-field="newEntity"/>
                 <create-value value-name="newEntity"/>
             </else>
             </if-empty>
@@ -57,7 +57,7 @@
         <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TechDataCalendar" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -102,7 +102,7 @@
         <else>
             <make-value value-field="newEntity" entity-name="TechDataCalendarWeek"/>
             <set-pk-fields map="parameters" value-field="newEntity"/>
-            <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+            <set-nonpk-fields map="parameters" value-field="newEntity"/>
             <create-value value-name="newEntity"/>
         </else>
         </if-not-empty>
@@ -114,7 +114,7 @@
         <make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TechDataCalendarWeek" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -159,7 +159,7 @@
         <else>
             <make-value value-field="newEntity" entity-name="TechDataCalendarExcDay"/>
             <set-pk-fields map="parameters" value-field="newEntity"/>
-            <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+            <set-nonpk-fields map="parameters" value-field="newEntity"/>
             <create-value value-name="newEntity"/>
         </else>
         </if-not-empty>
@@ -171,7 +171,7 @@
         <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcDay"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TechDataCalendarExcDay" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -200,7 +200,7 @@
         <else>
             <make-value value-field="newEntity" entity-name="TechDataCalendarExcWeek"/>
             <set-pk-fields map="parameters" value-field="newEntity"/>
-            <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+            <set-nonpk-fields map="parameters" value-field="newEntity"/>
             <create-value value-name="newEntity"/>
         </else>
         </if-not-empty>
@@ -212,7 +212,7 @@
         <make-value value-field="lookupPKMap" entity-name="TechDataCalendarExcWeek"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TechDataCalendarExcWeek" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Tue Dec 30 03:59:10 2008
@@ -26,7 +26,7 @@
         <check-errors/>
 
         <make-value entity-name="MarketingCampaign" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <!-- MarketingCampaign uses a sequenced id, so get the next one now and set it... -->        
         <sequenced-id-to-env sequence-name="MarketingCampaign" env-name="newEntity.marketingCampaignId"/>
@@ -42,7 +42,7 @@
         <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="MarketingCampaign" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -62,7 +62,7 @@
         <check-errors/>
 
         <make-value entity-name="MarketingCampaignPrice" value-field="newEntity"/>
-        <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map-name="parameters" value-name="newEntity"/> -->
+        <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map="parameters" value-field="newEntity"/> -->
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
         <create-value value-name="newEntity"/>
@@ -83,7 +83,7 @@
         <check-errors/>
 
         <make-value entity-name="MarketingCampaignPromo" value-field="newEntity"/>
-        <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map-name="parameters" value-name="newEntity"/> -->
+        <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map="parameters" value-field="newEntity"/> -->
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
         <create-value value-name="newEntity"/>
@@ -104,7 +104,7 @@
         <check-errors/>
 
         <make-value entity-name="MarketingCampaignRole" value-field="newEntity"/>
-        <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map-name="parameters" value-name="newEntity"/> -->
+        <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map="parameters" value-field="newEntity"/> -->
         <set-pk-fields map="parameters" value-field="newEntity"/>
 
         <create-value value-name="newEntity"/>
@@ -137,7 +137,7 @@
         
         
         <make-value entity-name="MarketingCampaignRole" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         
@@ -158,7 +158,7 @@
         <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
         
         <entity-one entity-name="MarketingCampaignRole" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteMarketingCampaignRole" short-description="Remove Role from MarketingCampaign">