You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2019/01/12 11:28:43 UTC
svn commit: r1851160 - in /ofbiz/ofbiz-framework/branches/release17.12: ./
applications/humanres/servicedef/services.xml
applications/product/servicedef/services.xml
framework/entityext/servicedef/services.xml
Author: mbrohl
Date: Sat Jan 12 11:28:43 2019
New Revision: 1851160
URL: http://svn.apache.org/viewvc?rev=1851160&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/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/servicedef/services.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 12 11:28:43 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:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850918,1850948,1850953,1851006,1851068,1851074,1851130
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158
Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/servicedef/services.xml?rev=1851160&r1=1851159&r2=1851160&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/servicedef/services.xml Sat Jan 12 11:28:43 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/release17.12/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services.xml?rev=1851160&r1=1851159&r2=1851160&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services.xml Sat Jan 12 11:28:43 2019
@@ -1576,49 +1576,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/release17.12/framework/entityext/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml?rev=1851160&r1=1851159&r2=1851160&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml Sat Jan 12 11:28:43 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>