svn commit: r698477 - in /ofbiz/trunk/applications/product: entitydef/entitymodel_old.xml script/org/ofbiz/product/UpgradeServices.xml servicedef/services_upgrade.xml

[as...@apache.org]

Author: ashish
Date: Wed Sep 24 02:28:47 2008
New Revision: 698477

URL: http://svn.apache.org/viewvc?rev=698477&view=rev
Log:
Improvement based on David's Comment on my previous commit that were based on Migration of FacilityRole entity to FacilityParty entity.

Thanks David for your comment.It was my mistake that somehow I missed this thing in my last commit.Although the "Old" prefix was there in migration work that I did few days back :-)

Modified:
    ofbiz/trunk/applications/product/entitydef/entitymodel_old.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml
    ofbiz/trunk/applications/product/servicedef/services_upgrade.xml

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_old.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_old.xml?rev=698477&r1=698476&r2=698477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_old.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_old.xml Wed Sep 24 02:28:47 2008
@@ -39,7 +39,7 @@
     <!-- org.ofbiz.product.facility -->
     <!-- ========================================================= -->
     
-    <entity entity-name="FacilityRole" table-name="FACILITY_ROLE"
+    <entity entity-name="OldFacilityRole" table-name="FACILITY_ROLE"
             package-name="org.ofbiz.product.facility"
             title="Facility Role Entity">
       <field name="facilityId" type="id-ne"></field>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml?rev=698477&r1=698476&r2=698477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml Wed Sep 24 02:28:47 2008
@@ -21,14 +21,14 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     
-    <simple-method method-name="migrateFacilityRole" short-description="Migrate Data From FacilityRole To FacilityParty">
-        <entity-condition entity-name="FacilityRole" list-name="facilityRoles"/>
+    <simple-method method-name="migrateFacilityRole" short-description="Migrate Data From OldFacilityRole To FacilityParty">
+        <entity-condition entity-name="OldFacilityRole" list-name="oldFacilityRoles"/>
         <now-timestamp-to-env env-name="fromDate"/>
-        <iterate list-name="facilityRoles" entry-name="facilityRole">
+        <iterate list-name="oldFacilityRoles" entry-name="oldFacilityRole">
             <make-value entity-name="FacilityParty" value-name="facilityParty"/>
-            <set field="facilityParty.facilityId" from-field="facilityRole.facilityId"/>
-            <set field="facilityParty.partyId" from-field="facilityRole.partyId"/>
-            <set field="facilityParty.roleTypeId" from-field="facilityRole.roleTypeId"/>
+            <set field="facilityParty.facilityId" from-field="oldFacilityRole.facilityId"/>
+            <set field="facilityParty.partyId" from-field="oldFacilityRole.partyId"/>
+            <set field="facilityParty.roleTypeId" from-field="oldFacilityRole.roleTypeId"/>
             <set field="facilityParty.fromDate" from-field="fromDate"/>
             <entity-one entity-name="PartyRole" value-name="partyRole" auto-field-map="false">
                 <field-map field-name="partyId" env-name="facilityParty.partyId"/>

Modified: ofbiz/trunk/applications/product/servicedef/services_upgrade.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_upgrade.xml?rev=698477&r1=698476&r2=698477&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_upgrade.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_upgrade.xml Wed Sep 24 02:28:47 2008
@@ -26,7 +26,7 @@
     <service name="migrateFacilityRole" engine="simple"
             location="org/ofbiz/product/UpgradeServices.xml" invoke="migrateFacilityRole">
         <description>
-            Migrate data from FacilityRole to FacilityParty.
+            Migrate data from OldFacilityRole to FacilityParty.
             Since revision 698159 (2008-09-23) the entity FacilityRole has been deprecated.
             This service can be used to upgrade existing data from the FacilityRole entity to the new
             FacilityParty entity.