svn commit: r470730 - in /incubator/ofbiz/trunk/applications: content/script/org/ofbiz/content/content/ content/script/org/ofbiz/content/layout/ content/script/org/ofbiz/content/website/ party/script/org/ofbiz/party/customer/ party/script/org/ofbiz/par...

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

svn commit: r470730 - in /incubator/ofbiz/trunk/applications: content/script/org/ofbiz/content/content/ content/script/org/ofbiz/content/layout/ content/script/org/ofbiz/content/website/ party/script/org/ofbiz/party/customer/ party/script/org/ofbiz/par...

jacopoc
Author: jacopoc
Date: Fri Nov  3 01:00:23 2006
New Revision: 470730

URL: http://svn.apache.org/viewvc?view=rev&rev=470730
Log:
Applied patch from Ashish Vijaywargiya (OFBIZ-402) to convert deprecated minilang operations.

Modified:
    incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
    incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
    incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
    incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
    incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
    incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml

Modified: incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Fri Nov  3 01:00:23 2006
@@ -41,7 +41,7 @@
       <log level="always" message="context: ${context}"/>
       <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId" />  
       <string-to-list list-name="targetOperationList" string="CONTENT_CREATE"/>
-      <env-to-field env-name="targetOperationList" map-name="context" field-name="targetOperationList" />  
+      <set field="context.targetOperationList" from-field="targetOperationList" />  
       <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
       <call-service in-map-name="context" service-name="createContent">
         <result-to-field field-name="contentId" result-name="contentId"/>
@@ -59,10 +59,9 @@
           <set field="currentEntityMap" from-field="entityMap"/>
       </if-not-empty>
       <make-value entity-name="Content" value-name="contentPK"/>
-      <env-to-field env-name="contentId"
-                map-name="contentPK" field-name="contentId"/>
+      <set field="contentPK.contentId" from-field="contentId" />  
       <log level="always" message="contentPK: ${contentPK}"/>
-      <env-to-field env-name="contentPK" map-name="currentEntityMap" field-name="Content" />
+      <set field="currentEntityMap.Content" from-field="contentPK" />  
       <log level="always" message="currentEntityMap: ${currentEntityMap}"/>
       <field-to-session session-name="currentEntityMap" field-name="currentEntityMap" />
 
@@ -101,9 +100,9 @@
       <map-to-map map-name="currentContent" to-map-name="context" />
       <get-related value-name="currentContent" relation-name="ContentPurpose"
                   list-name="contentPurposeList" />
-      <env-to-field env-name="contentPurposeList" map-name="context" field-name="contentPurposeList" />  
+      <set field="context.contentPurposeList" from-field="contentPurposeList" />  
       <string-to-list list-name="targetOperationList" string="CONTENT_UPDATE"/>
-      <env-to-field env-name="targetOperationList" map-name="context" field-name="targetOperationList" />  
+      <set field="context.targetOperationList" from-field="targetOperationList" />          
       <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
       <call-service in-map-name="context" service-name="updateContent">
         <result-to-field field-name="contentId" result-name="contentId"/>

Modified: incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Fri Nov  3 01:00:23 2006
@@ -23,7 +23,7 @@
         <if-empty field-name="contentId" map-name="currentContent">
             <make-next-seq-id seq-field-name="contentId" value-name="currentContent"/>
             <sequenced-id-to-env env-name="id" sequence-name="Content"/>
-            <env-to-field env-name="id" field-name="contentId" map-name="currentContent"/>
+            <set field="currentContent.contentId" from-field="id" />
         </if-empty>
         <log level="always" message="currentContent: ${currentContent}"/>
         <field-to-list field-name="contentPurposeTypeId"

Modified: incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Fri Nov  3 01:00:23 2006
@@ -27,7 +27,7 @@
       <log level="always" message="context: ${context}"/>
       <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId" />  
       <string-to-list list-name="targetOperationList" string="CONTENT_CREATE"/>
-      <env-to-field env-name="targetOperationList"  map-name="context" field-name="targetOperationList" />
+      <set field="context.targetOperationList" from-field="targetOperationList" />  
       <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
       <set field="context.objectInfo" from-field="parameters.drObjectInfo" />  
       <set field="context.dataResourceTypeId" value="LOCAL_FILE" />  
@@ -55,8 +55,7 @@
       <set field="context.currentContent" from-field="currentContent" />  
       <set field="context.contentPurposeTypeId" from-field="parameters.contentPurposeTypeId" />  
       <string-to-list list-name="targetOperationList" string="CONTENT_CREATE"/>
-      <env-to-field env-name="targetOperationList" map-name="context"
-               field-name="targetOperationList" />
+      <set field="context.targetOperationList" from-field="targetOperationList" />  
       <session-to-field field-name="userLogin" map-name="context" session-name="userLogin"/>
       <call-service in-map-name="context" service-name="checkContentPermission">
         <result-to-field field-name="permissionStatus" result-name="permissionStatus"/>

Modified: incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ incubator/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Fri Nov  3 01:00:23 2006
@@ -58,7 +58,7 @@
         
         <if-empty field-name="fromDate" map-name="newEntity">
             <now-timestamp-to-env env-name="nowTimestamp"/>
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
         
         <create-value value-name="newEntity"/>

Modified: incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Fri Nov  3 01:00:23 2006
@@ -31,8 +31,8 @@
         <set field="parameters.roleTypeId" value="CUSTOMER" />
 
         <if-compare field-name="create_allow_password" operator="not-equals" value="true">
-            <env-to-field env-name="default_customer_password" field-name="PASSWORD" map-name="parameters"/>
-            <env-to-field env-name="default_customer_password" field-name="CONFIRM_PASSWORD" map-name="parameters"/>
+            <set field="parameters.PASSWORD" from-field="default_customer_password" />
+            <set field="parameters.CONFIRM_PASSWORD" from-field="default_customer_password" />
             <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled" />
         </if-compare>
 
@@ -242,7 +242,7 @@
         <!-- create the PartyDataSource entry to track where this info came from... -->
         <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
         <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
-        <env-to-field env-name="nowStamp" field-name="fromDate" map-name="partyDataSource"/>
+        <set field="partyDataSource.fromDate" from-field="nowStamp" />
         <set field="partyDataSource.isCreate" value="Y" />
         <!-- get the visit from the session to get the visitId -->
         <session-to-field field-name="visit"/>

Modified: incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
+++ incubator/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Fri Nov  3 01:00:23 2006
@@ -64,8 +64,8 @@
         <now-timestamp-to-env env-name="nowStamp"/>
 
         <if-compare field-name="create_allow_password" operator="not-equals" value="true">
-            <env-to-field env-name="default_user_password" field-name="PASSWORD" map-name="parameters"/>
-            <env-to-field env-name="default_user_password" field-name="CONFIRM_PASSWORD" map-name="parameters"/>
+            <set field="parameters.PASSWORD" from-field="default_user_password" />
+            <set field="parameters.CONFIRM_PASSWORD" from-field="default_user_password" />
             <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled" />
         </if-compare>
 
@@ -283,7 +283,7 @@
         <!-- create the PartyDataSource entry to track where this info came from... -->
         <make-value entity-name="PartyDataSource" value-name="partyDataSource"/>
         <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" />
-        <env-to-field env-name="nowStamp" field-name="fromDate" map-name="partyDataSource"/>
+        <set field="partyDataSource.fromDate" from-field="nowStamp" />
         <set field="partyDataSource.isCreate" value="Y" />
         <!-- get the visit from the session to get the visitId -->
         <session-to-field field-name="visit"/>

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Fri Nov  3 01:00:23 2006
@@ -25,7 +25,7 @@
 
         <if-empty field-name="fromDate" map-name="newEntity">
             <now-timestamp-to-env env-name="nowTimestamp"/>
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
 
         <create-value value-name="newEntity"/>

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Fri Nov  3 01:00:23 2006
@@ -33,7 +33,7 @@
         <now-timestamp-to-env env-name="nowTimestamp"/>
 
         <if-empty field-name="fromDate" map-name="newEntity">
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
         <field-to-result field-name="fromDate" map-name="newEntity"/>
 

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Fri Nov  3 01:00:23 2006
@@ -26,7 +26,7 @@
 
         <if-empty field-name="fromDate" map-name="newEntity">
             <now-timestamp-to-env env-name="nowTimestamp"/>
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
 
         <create-value value-name="newEntity"/>

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Fri Nov  3 01:00:23 2006
@@ -33,12 +33,12 @@
         <now-timestamp-to-env env-name="nowTimestamp"/>
 
         <if-empty field-name="fromDate" map-name="newEntity">
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
         <field-to-result field-name="fromDate" map-name="newEntity"/>
 
-        <env-to-field env-name="nowTimestamp" field-name="lastModifiedDate" map-name="newEntity"/>
-        <env-to-field env-name="nowTimestamp" field-name="createdDate" map-name="newEntity"/>
+        <set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
+        <set field="newEntity.createdDate" from-field="nowTimestamp" />
         <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId" />
         <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId" />
 
@@ -59,7 +59,7 @@
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
-        <env-to-field env-name="nowTimestamp" field-name="lastModifiedDate" map-name="lookedUpValue"/>
+        <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" />
         <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" />
 
         <store-value value-name="lookedUpValue"/>
@@ -97,10 +97,9 @@
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
 
         <sequenced-id-to-env sequence-name="ProductPriceChange" env-name="productPriceChangeId"/>
-        <env-to-field env-name="productPriceChangeId" map-name="newEntity"/>
-
+        <set field="newEntity.productPriceChangeId" from-field="productPriceChangeId" />    
         <now-timestamp-to-env env-name="nowTimestamp"/>
-        <env-to-field env-name="nowTimestamp" field-name="changedDate" map-name="newEntity"/>
+        <set field="newEntity.changedDate" from-field="nowTimestamp" />
         <set field="newEntity.changedByUserLogin" from-field="userLogin.userLoginId" />
 
         <create-value value-name="newEntity"/>

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Fri Nov  3 01:00:23 2006
@@ -26,7 +26,7 @@
 
         <if-empty field-name="fromDate" map-name="newEntity">
             <now-timestamp-to-env env-name="nowTimestamp"/>
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
 
         <create-value value-name="newEntity"/>

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Fri Nov  3 01:00:23 2006
@@ -44,7 +44,7 @@
         <field-to-request field-name="contactMechId" map-name="newValue"/>
         <set-nonpk-fields map-name="parameters" value-name="newValue"/>
         <now-timestamp-to-env env-name="nowTimestamp"/>
-        <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newValue"/>
+        <set field="newValue.fromDate" from-field="nowTimestamp" />
         <create-value value-name="newValue"/>
     </simple-method>
     
@@ -87,8 +87,8 @@
 
         <set-nonpk-fields value-name="newFacilityContactMech" map-name="parameters" set-if-null="false"/>
         <now-timestamp-to-env env-name="now"/>
-        <env-to-field env-name="now" field-name="fromDate" map-name="newFacilityContactMech"/>
-        <env-to-field env-name="now" field-name="thruDate" map-name="facilityContactMech"/>
+        <set field="newFacilityContactMech.fromDate" from-field="now" />
+        <set field="facilityContactMech.thruDate" from-field="now" />
         <field-to-list list-name="storeList" field-name="newFacilityContactMech"/>
         
         <if-compare-field field-name="contactMechId" map-name="parameters" to-map-name="newFacilityContactMech" operator="not-equals">
@@ -120,7 +120,7 @@
             <return/>
         </if-empty>
         <now-timestamp-to-env env-name="now"/>
-        <env-to-field env-name="now" field-name="thruDate" map-name="facilityContactMech"/>
+        <set field="facilityContactMech.thruDate" from-field="now" />
         <store-value value-name="facilityContactMech"/>
     </simple-method>
     
@@ -272,7 +272,7 @@
         <set field="newEntity.facilityId" from-field="parameters.facilityId" />
         <set field="newEntity.contactMechId" from-field="parameters.contactMechId" />
         <set field="newEntity.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId" />
-        <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+        <set field="newEntity.fromDate" from-field="nowTimestamp" />
         <create-value value-name="newEntity"/>
         
         <field-to-result field-name="fromDate" map-name="newEntity" result-name="fromDate"/>
@@ -292,7 +292,7 @@
         </if-empty>
         
         <now-timestamp-to-env env-name="nowTimestamp"/>
-        <env-to-field env-name="nowTimestamp" field-name="thruDate" map-name="purposeEntity"/>
+        <set field="purposeEntity.thruDate" from-field="nowTimestamp" />
         <store-value value-name="purposeEntity"/>                
     </simple-method>    
 </simple-methods>

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?view=diff&rev=470730&r1=470729&r2=470730
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Fri Nov  3 01:00:23 2006
@@ -28,7 +28,7 @@
         
         <sequenced-id-to-env sequence-name="Facility" env-name="facilityId"/>
         <to-string field-name="facilityId"/>
-        <env-to-field env-name="facilityId" map-name="newEntity"/>
+        <set field="newEntity.facilityId" from-field="facilityId" />
         <field-to-result field-name="facilityId" result-name="facilityId"/>
         
         <create-value value-name="newEntity"/>
@@ -81,12 +81,12 @@
         <set field="locationSeqId" value="${parameters.areaId}${parameters.aisleId}${parameters.sectionId}${parameters.levelId}${parameters.positionId}"/>
         <!-- check to see if it exists already, if so try a simple suffix, then give up and use a sequenced id -->
         <if-not-empty field-name="locationSeqId">
-            <env-to-field env-name="locationSeqId" map-name="checkLocationSeqIdMap"/>
+            <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" />
             <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" />
             <find-by-primary-key entity-name="FacilityLocation" map-name="checkLocationSeqIdMap" value-name="checkLocationSeqIdValue"/>
             <if-not-empty field-name="checkLocationSeqIdValue">
                 <set field="locationSeqId" value="${locationSeqId}_2" />
-                <env-to-field env-name="locationSeqId" map-name="checkLocationSeqIdMap"/>
+                <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" />
                 <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" />
                 <find-by-primary-key entity-name="FacilityLocation" map-name="checkLocationSeqIdMap" value-name="checkLocationSeqIdValue"/>
                 <if-not-empty field-name="checkLocationSeqIdValue">
@@ -99,8 +99,7 @@
             <sequenced-id-to-env sequence-name="FacilityLocation" env-name="locationSeqId"/>
             <to-string field-name="locationSeqId"/>
         </if-empty>
-        
-        <env-to-field env-name="locationSeqId" map-name="newEntity"/>
+        <set field="newEntity.locationSeqId" from-field="locationSeqId" />
         <field-to-result field-name="locationSeqId" result-name="locationSeqId"/>
         
         <create-value value-name="newEntity"/>
@@ -135,7 +134,7 @@
         
         <sequenced-id-to-env sequence-name="FacilityGroup" env-name="facilityGroupId"/>
         <to-string field-name="facilityGroupId"/>
-        <env-to-field env-name="facilityGroupId" map-name="newEntity"/>
+        <set field="newEntity.facilityGroupId" from-field="facilityGroupId" />
         <field-to-result field-name="facilityGroupId" result-name="facilityGroupId"/>
         
         <create-value value-name="newEntity"/>
@@ -169,7 +168,7 @@
         
         <if-empty field-name="fromDate" map-name="newEntity">
             <now-timestamp-to-env env-name="nowTimestamp"/>
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
         
         <create-value value-name="newEntity"/>
@@ -205,7 +204,7 @@
         
         <if-empty field-name="fromDate" map-name="newEntity">
             <now-timestamp-to-env env-name="nowTimestamp"/>
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newEntity"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp" />
         </if-empty>
         
         <create-value value-name="newEntity"/>