svn commit: r1851159 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/humanres/servicedef/services.xml applications/product/servicedef/services.xml framework/entityext/servicedef/services.xml

[mbrohl]

Author: mbrohl
Date: Sat Jan 12 11:27:58 2019
New Revision: 1851159

URL: http://svn.apache.org/viewvc?rev=1851159&view=rev
Log:
Applied fix from trunk for revision: 1851158
===

Fixed: Errors and warnings in webtools' ArtifactInfo
(OFBIZ-10760)

This fixes an engine declaration mistake introduced in OFBIZ-9111,
removes an unused service which should have been deleted in OFBIZ-8722
and removes unused services which should have been deleted in
OFBIZ-10146.

Thanks Mathieu Lirzin for reporting and providing the patches.

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/servicedef/services.xml
    ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services.xml
    ofbiz/ofbiz-framework/branches/release18.12/framework/entityext/servicedef/services.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 12 11:27:58 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/servicedef/services.xml?rev=1851159&r1=1851158&r2=1851159&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/humanres/servicedef/services.xml Sat Jan 12 11:27:58 2019
@@ -253,12 +253,12 @@ under the License.
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
 
-    <service name="deletePayHistory" engine="simple" default-entity-name="PayHistory" invoke="delete" auth="true">
+    <service name="deletePayHistory" engine="entity-auto" default-entity-name="PayHistory" invoke="delete" auth="true">
         <description>Delete Pay History</description>
         <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
-    <service name="expirePayHistory" engine="simple" default-entity-name="PayHistory" invoke="expire" auth="true">
+    <service name="expirePayHistory" engine="entity-auto" default-entity-name="PayHistory" invoke="expire" auth="true">
         <description>Expire Pay History</description>
         <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services.xml?rev=1851159&r1=1851158&r2=1851159&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services.xml Sat Jan 12 11:27:58 2019
@@ -1574,49 +1574,6 @@ under the License.
         <attribute name="drDataResourceName" mode="IN" type="String" optional="false"/>
     </service>
     
-    <!-- Best Selling Category Services -->
-    <service name="loadBestSellingCategory" engine="simple"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="loadBestSellingCategory" auth="true">
-        <description>Load data of best selling category by week.</description>
-        <attribute name="productStoreId" mode="IN" type="String" optional="false"/>
-    </service>
-    
-    <service name="RemoveProductFromBestSellCategory" engine="simple"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="RemoveProductFromBestSellCategory" auth="true">
-        <description>Remove products from best selling category.</description>
-        <attribute name="prodCatalogId" mode="IN" type="String" optional="false"/>
-    </service>
-    
-    <service name="AddProductToBestSellCategory" engine="simple"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="AddProductToBestSellCategory" auth="true">
-        <description>Add products to best selling category.</description>
-        <attribute name="productStoreId" mode="IN" type="String" optional="false"/>
-        <attribute name="prodCatalogId" mode="IN" type="String" optional="false"/>
-        <attribute name="week" mode="IN" type="Long" optional="false"/>
-        <attribute name="year" mode="IN" type="Long" optional="false"/>
-    </service>
-    
-    <service name="FindCategoryChild" engine="simple"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="FindCategoryChild" auth="true">
-        <description>Find category child.</description>
-        <attribute name="productStoreId" mode="IN" type="String" optional="false"/>
-        <attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
-        <attribute name="primaryProductCategoryId" mode="IN" type="String" optional="false"/>
-        <attribute name="week" mode="IN" type="Long" optional="false"/>
-        <attribute name="year" mode="IN" type="Long" optional="false"/>
-    </service>
-    
-    <service name="FindBestSellingProduct" engine="simple"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="FindBestSellingProduct" auth="true">
-        <description>Find best selling product.</description>
-        <attribute name="productStoreId" mode="IN" type="String" optional="false"/>
-        <attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
-        <attribute name="primaryProductCategoryId" mode="IN" type="String" optional="false"/>
-        <attribute name="week" mode="IN" type="Long" optional="false"/>
-        <attribute name="year" mode="IN" type="Long" optional="false"/>
-        <attribute name="productCategoryId" mode="OUT" type="String" optional="true"/>
-    </service>
-    
     <!-- Alternative URLs -->
     <service name="createMissingCategoryAndProductAltUrls" engine="simple"
                 location="component://product/minilang/product/catalog/CatalogServices.xml" invoke="createMissingCategoryAndProductAltUrls" auth="true" use-transaction="false">

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/entityext/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/entityext/servicedef/services.xml?rev=1851159&r1=1851158&r2=1851159&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/entityext/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/entityext/servicedef/services.xml Sat Jan 12 11:27:58 2019
@@ -200,11 +200,6 @@ under the License.
         <permission-service service-name="entitySyncPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="updateEntitySyncRunning" engine="simple"
-            location="component://entityext/minilang/EntitySyncServices.xml" invoke="updateEntitySync" auth="true" require-new-transaction="true">
-        <description>Update EntitySync while Running</description>
-        <implements service="updateEntitySync"/>
-    </service>
     <service name="createEntitySyncHistory" default-entity-name="EntitySyncHistory" engine="simple"
             location="component://entityext/minilang/EntitySyncServices.xml" invoke="createEntitySyncHistory" auth="true" require-new-transaction="true">
         <description>Create EntitySyncHistory</description>