svn commit: r1792182 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/minilang/ applications/accounting/minilang/rate/ applications/accounting/servicedef/ applications/datamodel/entitydef/ applications/humanres/ applications/humanres/minilang...

[Deepak Dixit-5]

Author: deepak
Date: Fri Apr 21 11:21:32 2017
New Revision: 1792182

URL: http://svn.apache.org/viewvc?rev=1792182&view=rev
Log:
Improved: Removed deprecated entity related migration service, also removed some more deprecated entities that are located in entitymodel.xml instead entitymodel_old.xm (OFBIZ-9327)

Removed:
    ofbiz/ofbiz-framework/trunk/applications/humanres/minilang/UpgradeServices.xml
    ofbiz/ofbiz-framework/trunk/applications/humanres/servicedef/services_upgrade.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/UpgradeServices.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services_upgrade.xml
Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/UpgradeServices.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/rate/RateServices.xml
    ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_upgrade.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml
    ofbiz/ofbiz-framework/trunk/applications/humanres/ofbiz-component.xml
    ofbiz/ofbiz-framework/trunk/applications/order/minilang/UpgradeServices.xml
    ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_upgrade.xml
    ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/UpgradeServices.xml
    ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_upgrade.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml
    ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/UpgradeServices.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/UpgradeServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/UpgradeServices.xml Fri Apr 21 11:21:32 2017
@@ -49,33 +49,4 @@ under the License.
             </if-empty>
         </iterate>
     </simple-method>
-
-    <simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter">
-        <entity-condition entity-name="FixedAssetMaintMeter" list="maintMeterList"/>
-        <iterate list="maintMeterList" entry="maintMeter">
-            <make-value value-field="newEntity" entity-name="FixedAssetMeter"/>
-            <set-pk-fields map="maintMeter" value-field="newEntity"/>
-            <set-nonpk-fields map="maintMeter" value-field="newEntity"/>
-            <set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/>
-            <entity-one entity-name="FixedAssetMeter" value-field="lookedUpValue" auto-field-map="false">
-                <field-map field-name="fixedAssetId" from-field="newEntity.fixedAssetId"/>
-                <field-map field-name="productMeterTypeId" from-field="newEntity.productMeterTypeId"/>
-                <field-map field-name="readingDate" from-field="newEntity.readingDate"/>
-            </entity-one>
-            <if-empty field="lookedUpValue">
-                <create-value value-field="newEntity"/>
-                <check-errors/>
-            </if-empty>
-        </iterate>
-    </simple-method>
-
-    <simple-method method-name="migrateAgreementWorkEffortAppl" short-description="Copy AgreementWorkEffortAppl To AgreementWorkEffortApplic">
-        <entity-condition entity-name="OldAgreementWorkEffortAppl" list="agreementWorkEffortApplList"/>
-        <iterate list="agreementWorkEffortApplList" entry="agreementWorkEffortAppl">
-            <make-value value-field="newEntity" entity-name="AgreementWorkEffortApplic"/>
-            <set-pk-fields map="agreementWorkEffortAppl" value-field="newEntity"/>
-            <create-value value-field="newEntity"/>
-            <check-errors/>
-        </iterate>
-    </simple-method>        
 </simple-methods>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/rate/RateServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/rate/RateServices.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/rate/RateServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/rate/RateServices.xml Fri Apr 21 11:21:32 2017
@@ -386,36 +386,4 @@ under the License.
         <set field="delRateAmount.fromDate" from-field="parameters.rateAmountFromDate"/>
         <call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/>
     </simple-method>
-
-    <!-- migrate service -->
-    <simple-method method-name="migrateRateFactor" short-description="migrate the several entities which were change in the rate refactor activity">
-        <entity-condition entity-name="OldEmplPositionTypeRate" list="posRates"/>
-        <iterate list="posRates" entry="posRate">
-            <make-value value-field="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/>
-            <set-pk-fields value-field="posRate" map="emplPositionTypeRate"/>
-            <set-nonpk-fields map="emplPositionTypeRate" value-field="posRate"/>
-            <create-value value-field="emplPositionTypeRate"/>
-            <make-value value-field="rateAmount" entity-name="RateAmount"/>
-            <set-pk-fields value-field="posRate" map="rateAmount"/>
-            <set-nonpk-fields map="rateAmount" value-field="posRate"/>
-            <set field="rateAmount.workeffortId" value="_NA_"/>
-            <set field="rateAmount.partyId" value="_NA_"/>
-            <property-to-field resource="general.properties" property="currency.uom.id.default" field="rateAmount.rateCurrencyUomId"/>
-            <create-value value-field="rateAmount"/>
-        </iterate>
-        <entity-condition entity-name="OldPartyRate" list="partyRates"/>
-        <iterate list="oldPartyRates" entry="oldPartyRate">
-            <make-value value-field="partyRate" entity-name="PartyRate"/>
-            <set-pk-fields value-field="oldPartyRate" map="partyRate"/>
-            <set-nonpk-fields map="partyRate" value-field="oldPartyRate"/>
-            <create-value value-field="partyRate"/>
-            <make-value value-field="rateAmount" entity-name="RateAmount"/>
-            <set-pk-fields value-field="oldPartyRate" map="rateAmount"/>
-            <set-nonpk-fields map="rateAmount" value-field="oldPartyRate"/>
-            <set field="rateAmount.workeffortId" value="_NA_"/>
-            <set field="rateAmount.emplPositionTypeId" value="_NA_"/>
-            <set field="rateAmount.periodTypeId" value="RATE_HOUR"/>
-            <create-value value-field="rateAmount"/>
-        </iterate>
-    </simple-method>
 </simple-methods>

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_upgrade.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_upgrade.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_upgrade.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_upgrade.xml Fri Apr 21 11:21:32 2017
@@ -43,15 +43,4 @@ under the License.
         </description>
     </service>
 
-    <service name="migrateFixedAssetMaintMeter" engine="simple"
-                location="component://accounting/minilang/UpgradeServices.xml" invoke="migrateFixedAssetMaintMeter" auth="true">
-        <description>Copy the FixedAssetMaintMeter entity to FixedAssetMeter. FixedAssetMeter.readingDate will be replaced with FixedAssetMaintMeter.createdStamp.</description>
-        <permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
-    </service>
-    
-    <service name="migrateAgreementWorkEffortAppl" engine="simple"
-                location="component://accounting/minilang/UpgradeServices.xml" invoke="migrateAgreementWorkEffortAppl" auth="true">
-        <description>Copy the AgreementWorkEffortAppl entity to AgreementWorkEffortApplic</description>
-        <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/>
-    </service>    
 </services>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Fri Apr 21 11:21:32 2017
@@ -807,7 +807,7 @@ under the License.
         <field name="productMaintSeqId" type="id"><description>Optional, though should be filled in to determine upcoming maintenance for all scheduled maintenance</description></field>
         <field name="scheduleWorkEffortId" type="id"><description>Has field for estimated/actual start and finish dates, etc</description></field>
         <field name="intervalQuantity" type="fixed-point"></field>
-        <field name="intervalUomId" type="id"><description>UOM for intervalQuantity; if used intervalMeterTypeId is generally not used (ie one or the other); if a meter reading is done as well that is not tied to the interval it should be tracked in a FixedAssetMaintMeter record</description></field>
+        <field name="intervalUomId" type="id"><description>UOM for intervalQuantity; if used intervalMeterTypeId is generally not used (ie one or the other); if a meter reading is done as well that is not tied to the interval it should be tracked in a FixedAssetMeter record</description></field>
         <field name="intervalMeterTypeId" type="id"><description>Meter Type for intervalQuantity; if used intervalUomId is generally not used (ie one or the other)</description></field>
         <field name="purchaseOrderId" type="id"></field>
         <prim-key field="fixedAssetId"/>
@@ -835,24 +835,6 @@ under the License.
         </relation>
 
     </entity>
-    <entity entity-name="FixedAssetMaintMeter"
-        package-name="org.apache.ofbiz.accounting.fixedasset"
-        title="Deprecated - use FixedAssetMeter">
-        <field name="fixedAssetId" type="id-ne"></field>
-        <field name="maintHistSeqId" type="id-ne"></field>
-        <field name="productMeterTypeId" type="id-ne"></field>
-        <field name="meterValue" type="fixed-point"></field>
-        <prim-key field="fixedAssetId"/>
-        <prim-key field="maintHistSeqId"/>
-        <prim-key field="productMeterTypeId"/>
-        <relation type="one" fk-name="FXDASTMNMT_FAMNT" rel-entity-name="FixedAssetMaint">
-            <key-map field-name="fixedAssetId"/>
-            <key-map field-name="maintHistSeqId"/>
-        </relation>
-        <relation type="one" fk-name="FXDASTMNMT_PMTYP" rel-entity-name="ProductMeterType">
-            <key-map field-name="productMeterTypeId"/>
-        </relation>
-    </entity>
     <entity entity-name="FixedAssetMeter"
         package-name="org.apache.ofbiz.accounting.fixedasset"
         title="Fixed Asset Meter Entity">

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/party-entitymodel.xml Fri Apr 21 11:21:32 2017
@@ -2720,26 +2720,6 @@ under the License.
           <key-map field-name="changeByUserLoginId" rel-field-name="userLoginId"/>
       </relation>
     </entity>
-    <entity entity-name="OldPartyTaxInfo" table-name="PARTY_TAX_INFO"
-            package-name="org.apache.ofbiz.party.party"
-            title="Party Tax Information Entity">
-      <description>NOTE: this entity is deprecated by PartyTaxAuthInfo</description>
-      <field name="partyId" type="id-ne"></field>
-      <field name="geoId" type="id-ne"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <field name="partyTaxId" type="id-long-ne"></field>
-      <field name="isExempt" type="indicator"></field>
-      <prim-key field="partyId"/>
-      <prim-key field="geoId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="PARTY_TXI_PTY" rel-entity-name="Party">
-        <key-map field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="PARTY_TXI_GEO" rel-entity-name="Geo">
-        <key-map field-name="geoId"/>
-      </relation>
-    </entity>
     <entity entity-name="PartyType"
             package-name="org.apache.ofbiz.party.party"
             default-resource-name="PartyEntityLabels"

Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/ofbiz-component.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/ofbiz-component.xml Fri Apr 21 11:21:32 2017
@@ -34,7 +34,6 @@ under the License.
     <service-resource type="model" loader="main" location="servicedef/services_ability.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_employment.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_position.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/>
 
     <webapp name="humanres"
         title="HR"

Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/UpgradeServices.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/UpgradeServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/UpgradeServices.xml Fri Apr 21 11:21:32 2017
@@ -21,34 +21,6 @@ under the License.
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
 
-    <simple-method method-name="migrateOrderItemAssociation" short-description="Migrate data from OldOrderItemAssociation to OrderItemAssoc">
-        <entity-condition entity-name="OldOrderItemAssociation" list="oldOrderItemAssociations"/>
-        <iterate list="oldOrderItemAssociations" entry="oldOrderItemAssociation">
-            <make-value entity-name="OrderItemAssoc" value-field="orderItemAssoc"/>
-            <set field="orderItemAssoc.orderId" from-field="oldOrderItemAssociation.salesOrderId"/>
-            <set field="orderItemAssoc.orderItemSeqId" from-field="oldOrderItemAssociation.soItemSeqId"/>
-            <set field="orderItemAssoc.toOrderId" from-field="oldOrderItemAssociation.purchaseOrderId"/>
-            <set field="orderItemAssoc.toOrderItemSeqId" from-field="oldOrderItemAssociation.poItemSeqId"/>
-            <set field="orderItemAssoc.shipGroupSeqId" value="_NA_"/>
-            <set field="orderItemAssoc.toShipGroupSeqId" value="_NA_"/>
-            <set field="orderItemAssoc.orderItemAssocTypeId" value="PURCHASE_ORDER"/>
-            <create-value value-field="orderItemAssoc"/>
-        </iterate>
-    </simple-method>
-
-    <simple-method method-name="migrateCustRequestRole" short-description="Migrate data from OldCustRequestRole to CustRequestParty">
-        <entity-condition entity-name="OldCustRequestRole" list="oldCustRequestRoles"/>
-        <now-timestamp field="fromDate"/>
-        <iterate list="oldCustRequestRoles" entry="oldCustRequestRole">
-            <make-value entity-name="CustRequestParty" value-field="custRequestParty"/>
-            <set field="custRequestParty.custRequestId" from-field="oldCustRequestRole.custRequestId"/>
-            <set field="custRequestParty.partyId" from-field="oldCustRequestRole.partyId"/>
-            <set field="custRequestParty.roleTypeId" from-field="oldCustRequestRole.roleTypeId"/>
-            <set field="custRequestParty.fromDate" from-field="fromDate"/>
-            <create-value value-field="custRequestParty"/>
-        </iterate>
-    </simple-method>
-
     <simple-method method-name="migrateOrderShipment" short-description="Migrate data from ItemIssuances to OrderShipments when the records are not used to record item issuances but only an order to shipment association.">
         <entity-condition entity-name="ItemIssuance" list="itemIssuances">
             <condition-list combine="and">

Modified: ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_upgrade.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_upgrade.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_upgrade.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_upgrade.xml Fri Apr 21 11:21:32 2017
@@ -22,29 +22,6 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
     <description>Order Services</description>
     <vendor>OFBiz</vendor>
-
-    <service name="migrateOrderItemAssociation" engine="simple"
-            location="component://order/minilang/UpgradeServices.xml" invoke="migrateOrderItemAssociation">
-        <description>
-            Migrate data from OldOrderItemAssociation to OrderItemAssoc.
-            Since revision 485144 (2006-12-10) the entity OrderItemAssociation has been deprecated.
-            This service can be used to upgrade existing data from the OrderItemAssociation entity to the new
-            OrderItemAssoc entity.
-            Before running this service, load the seed data for the OrderItemAssocType entity from the file:
-            order/data/OrderTypeData.xml
-        </description>
-    </service>
-    <service name="migrateCustRequestRole" engine="simple"
-            location="component://order/minilang/UpgradeServices.xml" invoke="migrateCustRequestRole">
-        <description>
-            Migrate data from OldCustRequestRole to CustRequestParty.
-            Since revision 684647 (2008-08-11) the entity CustRequestRole has been deprecated.
-            This service can be used to upgrade existing data from the OldCustRequestRole entity to the new
-            CustRequestParty entity.
-            Before running this service, load the seed data for the RoleType entity from the file:
-            party/data/PartyTypeData.xml
-        </description>
-    </service>
     <service name="migrateOrderShipment" engine="simple"
             location="component://order/minilang/UpgradeServices.xml" invoke="migrateOrderShipment">
         <description>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/UpgradeServices.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/UpgradeServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/UpgradeServices.xml Fri Apr 21 11:21:32 2017
@@ -21,30 +21,6 @@ under the License.
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
 
-    <simple-method method-name="migrateFacilityRole" short-description="Migrate Data From OldFacilityRole To FacilityParty">
-        <entity-condition entity-name="OldFacilityRole" list="oldFacilityRoles"/>
-        <now-timestamp field="fromDate"/>
-        <iterate list="oldFacilityRoles" entry="oldFacilityRole">
-            <make-value entity-name="FacilityParty" value-field="facilityParty"/>
-            <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-field="partyRole" auto-field-map="false">
-                <field-map field-name="partyId" from-field="facilityParty.partyId"/>
-                <field-map field-name="roleTypeId" from-field="facilityParty.roleTypeId"/>
-            </entity-one>
-            <if-empty field="partyRole">
-                <make-value entity-name="PartyRole" value-field="partyRole"/>
-                <set field="partyRole.partyId" from-field="facilityParty.partyId"/>
-                <set field="partyRole.roleTypeId" from-field="facilityParty.roleTypeId"/>
-                <create-value value-field="partyRole"/>
-                <check-errors/>
-            </if-empty>
-            <create-value value-field="facilityParty"/>
-        </iterate>
-    </simple-method>
-
     <simple-method method-name="migrateFacilitySquareFootage" short-description="Migrate Data From from Facility.oldSquareFootage to Facility.facilitySize">
         <entity-condition entity-name="Facility" list="facilities"/>
         <iterate list="facilities" entry="facility">
@@ -56,23 +32,4 @@ under the License.
         </iterate>
     </simple-method>
 
-     <simple-method method-name="migrateProductKeyword" short-description="Migrate Data From OldProductKeyword To ProductKeyword">
-        <entity-condition entity-name="OldProductKeyword" list="oldProductKeywords"/>
-        <iterate list="oldProductKeywords" entry="oldProductKeyword">
-            <entity-one entity-name="ProductKeyword" value-field="checkProductKeyword">
-                <field-map field-name="productId" from-field="oldProductKeyword.productId"/>
-                <field-map field-name="keyword" from-field="oldProductKeyword.keyword"/>
-                <field-map field-name="keywordTypeId" value="KWT_KEYWORD"/>
-            </entity-one>
-            <if-empty field="checkProductKeyword">
-                <make-value entity-name="ProductKeyword" value-field="productKeyword"/>
-                <set field="productKeyword.productId" from-field="oldProductKeyword.productId"/>
-                <set field="productKeyword.keyword" from-field="oldProductKeyword.keyword"/>
-                <set field="productKeyword.keywordTypeId" value="KWT_KEYWORD"/>
-                <set field="productKeyword.relevancyWeight" from-field="oldProductKeyword.relevancyWeight"/>
-                <create-value value-field="productKeyword"/>
-            </if-empty>
-        </iterate>
-    </simple-method>
-
 </simple-methods>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_upgrade.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_upgrade.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_upgrade.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_upgrade.xml Fri Apr 21 11:21:32 2017
@@ -22,18 +22,6 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
     <description>Product Services</description>
     <vendor>OFBiz</vendor>
-
-    <service name="migrateFacilityRole" engine="simple"
-            location="component://product/minilang/product/UpgradeServices.xml" invoke="migrateFacilityRole">
-        <description>
-            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.
-            Before running this service, load the seed data for the RoleType entity from the file:
-            party/data/PartyTypeData.xml
-        </description>
-    </service>
     <service name="migrateFacilitySquareFootage" engine="simple"
             location="component://product/minilang/product/UpgradeServices.xml" invoke="migrateFacilitySquareFootage">
         <description>
@@ -41,16 +29,5 @@ under the License.
             The field Facility.squareFootageSince has been deprecated since revision 929912 (2010-04-01)
         </description>
     </service>
-    <service name="migrateProductKeyword" engine="simple"
-            location="component://product/minilang/product/UpgradeServices.xml" invoke="migrateProductKeyword">
-        <description>
-            Migrate data from oldProductKeyword to ProductKeyword.
-            The entity oldProductKeyword has been deprecated.
-            This service can be used to upgrade existing data from the oldProductKeyword entity to the new
-            ProductKeyword entity.
-            Before running this service, load the seed data for the KeywordType entity from the file:
-            common/data/CommonTypeData.xml
-        </description>
-    </service>
 
 </services>

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/ofbiz-component.xml Fri Apr 21 11:21:32 2017
@@ -38,7 +38,6 @@ under the License.
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_timesheet.xml"/>
-    <service-resource type="model" loader="main" location="servicedef/services_upgrade.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_workeffort.xml"/>
     <service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
     <service-resource type="group" loader="main" location="servicedef/service_groups.xml"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml?rev=1792182&r1=1792181&r2=1792182&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml Fri Apr 21 11:21:32 2017
@@ -112,17 +112,6 @@ under the License.
         </relation>
     </entity>
   <!-- =========================================================
-     An entity for testing the BLOB data type
-   ========================================================== -->
-    <entity entity-name="TestBlob"
-        package-name="org.apache.ofbiz.entity.test"
-        title="Entity for testing the blob type (Deprecated)">
-        <description>Deprecated - use TestFieldType instead</description>
-        <field name="testBlobId" type="id-ne"/>
-        <field name="testBlobField" type="blob"/>
-         <prim-key field="testBlobId"/>
-    </entity>
-  <!-- =========================================================
      An entity for testing the field data types
    ========================================================== -->
     <entity entity-name="TestFieldType"