svn commit: r1850177 - in /ofbiz/ofbiz-framework/trunk/applications: accounting/servicedef/services_rate.xml marketing/servicedef/services.xml order/servicedef/services_quote.xml

[nmalin]

Author: nmalin
Date: Wed Jan  2 16:48:18 2019
New Revision: 1850177

URL: http://svn.apache.org/viewvc?rev=1850177&view=rev
Log:
Fixed: Update and clean deprecated code after release 18.12 creation
(OFBIZ-10761)
et all deprecated since='Upcoming Release' to since='Release 18.12'

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_rate.xml
    ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml
    ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_quote.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_rate.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_rate.xml?rev=1850177&r1=1850176&r2=1850177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_rate.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_rate.xml Wed Jan  2 16:48:18 2019
@@ -50,7 +50,7 @@ under the License.
     </service>
     <service name="deleteRateAmount" default-entity-name="RateAmount" engine="groovy" auth="true"
         location="component://accounting/groovyScripts/rate/RateServices.groovy" invoke="deleteRateAmount">
-        <description>Deprecated please use expireRateAmount</description>
+        <deprecated use-instead="expireRateAmount" since="Release 18.12"/>
         <permission-service service-name="acctgBasePermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <override name="rateTypeId" optional="false"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml?rev=1850177&r1=1850176&r2=1850177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml Wed Jan  2 16:48:18 2019
@@ -45,7 +45,7 @@ under the License.
 
     <!-- MarketingCampaignPrice Services -->
     <service name="addPriceRuleToMarketingCampaign" default-entity-name="MarketingCampaignPrice" engine="entity-auto" invoke="create" auth="true">
-        <deprecated since="Upcoming Release" use-instead="createMarketingCampaignPrice">
+        <deprecated since="Release 18.12" use-instead="createMarketingCampaignPrice">
             Renaming service to respect service name best practice
         </deprecated>
         <implements service="createMarketingCampaignPrice"/>
@@ -56,7 +56,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removePriceRuleFromMarketingCampaign" default-entity-name="MarketingCampaignPrice" engine="entity-auto" invoke="delete" auth="true">
-            <deprecated since="Upcoming Release" use-instead="deleteMarketingCampaignPrice">
+            <deprecated since="Release 18.12" use-instead="deleteMarketingCampaignPrice">
                 Renaming service to respect service name best practice
             </deprecated>
         <implements service="deleteMarketingCampaignPrice"/>
@@ -78,7 +78,7 @@ under the License.
 
     <!-- MarketingCampaignPromo Services -->
     <service name="addPromoToMarketingCampaign" default-entity-name="MarketingCampaignPromo" engine="entity-auto" invoke="create" auth="true">
-        <deprecated since="Upcoming Release" use-instead="createMarketingCampaignPromo">
+        <deprecated since="Release 18.12" use-instead="createMarketingCampaignPromo">
             Renaming service to respect service name best practice
         </deprecated>
         <implements service="createMarketingCampaignPromo"/>
@@ -89,7 +89,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removePromoFromMarketingCampaign" default-entity-name="MarketingCampaignPromo" engine="entity-auto" invoke="delete" auth="true">
-        <deprecated since="Upcoming Release" use-instead="deleteMarketingCampaignPromo">
+        <deprecated since="Release 18.12" use-instead="deleteMarketingCampaignPromo">
             Renaming service to respect service name best practice
         </deprecated>
         <implements service="deleteMarketingCampaignPromo"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_quote.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_quote.xml?rev=1850177&r1=1850176&r2=1850177&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_quote.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_quote.xml Wed Jan  2 16:48:18 2019
@@ -227,7 +227,7 @@ under the License.
 
     <!--Duplicate the service createQuoteWorkEffort, the first inform the deprecation, the second override and work normally-->
     <service name="createQuoteWorkEffort" default-entity-name="QuoteWorkEffort" engine="entity-auto" invoke="create" auth="true">
-        <deprecated use-instead="ensureWorkEffortAndCreateQuoteWorkEffort" since="Upcoming Release">
+        <deprecated use-instead="ensureWorkEffortAndCreateQuoteWorkEffort" since="Release 18.12">
             use createQuoteWorkEffort to create a workeffort has been deprecated for best pratice naming reason, use ensureWorkEffortAndCreateQuoteWorkEffort instead.
             Now createQuoteWorkEffort work as a crud service on QuoteWorkEffort
         </deprecated>