svn commit: r1822912 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/product/groovyScripts/product/ applications/product/groovyScripts/product/category/ applications/product/minilang/product/category/ applications/product/servicedef/ framework/co...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1822912 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/product/groovyScripts/product/ applications/product/groovyScripts/product/category/ applications/product/minilang/product/category/ applications/product/servicedef/ framework/co...

nmalin
Modified: ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services.xml?rev=1822912&r1=1822911&r2=1822912&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services.xml Thu Feb  1 22:33:59 2018
@@ -673,23 +673,23 @@ under the License.
     <!-- ======================================== -->
     <!-- Product Category Services -->
     <!-- ======================================== -->
-    <service name="createProductCategory" default-entity-name="ProductCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="createProductCategory" auth="true">
+    <service name="createProductCategory" default-entity-name="ProductCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="createProductCategory" auth="true">
         <description>Create an ProductCategory</description>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="productCategoryTypeId" optional="false"/>
     </service>
-    <service name="updateProductCategory" default-entity-name="ProductCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="updateProductCategory" auth="true">
+    <service name="updateProductCategory" default-entity-name="ProductCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="updateProductCategory" auth="true">
         <description>Update an ProductCategory</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="productCategoryTypeId" optional="false"/>
     </service>
 
-    <service name="duplicateProductCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="duplicateProductCategory" auth="true">
+    <service name="duplicateProductCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="duplicateProductCategory" auth="true">
         <description>Duplicate a Product Category using from oldProductCategoryId to a new productCategoryId</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="oldProductCategoryId" type="String" mode="IN" optional="false"/>
@@ -711,8 +711,8 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
-    <service name="addProductToCategories" default-entity-name="ProductCategoryMember" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="addProductToCategories" auth="true">
+    <service name="addProductToCategories" default-entity-name="ProductCategoryMember" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="addProductToCategories" auth="true">
         <description>Add Product To Multiple Categories</description>
         <permission-service service-name="checkCategoryPermissionWithViewPurchaseAllow" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false">
@@ -735,15 +735,15 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeProductFromCategory" default-entity-name="ProductCategoryMember" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="removeProductFromCategory" auth="true">
+    <service name="removeProductFromCategory" default-entity-name="ProductCategoryMember" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="removeProductFromCategory" auth="true">
         <description>Remove Product From Category</description>
         <permission-service service-name="checkCategoryPermissionWithViewPurchaseAllow" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createProductInCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="createProductInCategory" auth="true">
+    <service name="createProductInCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="createProductInCategory" auth="true">
         <description></description>
         <auto-attributes entity-name="ProductCategory" include="pk" mode="IN" optional="false"/>
         <auto-attributes entity-name="Product" include="pk" mode="INOUT" optional="true"/>
@@ -755,8 +755,8 @@ under the License.
         <attribute name="currencyUomId" type="String" mode="IN" optional="true"/>
     </service>
 
-    <service name="addPartyToCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="addPartyToCategory" auth="true">
+    <service name="addPartyToCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="addPartyToCategory" auth="true">
         <description>Add Party To Category</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -765,8 +765,8 @@ under the License.
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>
-    <service name="updatePartyToCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="updatePartyToCategory" auth="true">
+    <service name="updatePartyToCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="updatePartyToCategory" auth="true">
         <description>Update Party To Category</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -775,8 +775,8 @@ under the License.
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>
-    <service name="removePartyFromCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="removePartyFromCategory" auth="true">
+    <service name="removePartyFromCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="removePartyFromCategory" auth="true">
         <description>Remove Party From Category</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -815,8 +815,8 @@ under the License.
         <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
     </service>
 
-    <service name="safeAddProductCategoryToCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="addProductCategoryToCategory" auth="true">
+    <service name="safeAddProductCategoryToCategory" engine="groovy"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="addProductCategoryToCategory" auth="true">
         <description>Safe Add ProductCategory To Category (requires fromDate)</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="parentProductCategoryId" type="String" mode="IN" optional="false"/>
@@ -825,8 +825,8 @@ under the License.
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
     </service>
 
-    <service name="addProductCategoryToCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="addProductCategoryToCategory" auth="true">
+    <service name="addProductCategoryToCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="addProductCategoryToCategory" auth="true">
         <description>Add ProductCategory To Category</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="parentProductCategoryId" type="String" mode="IN" optional="false"/>
@@ -834,8 +834,8 @@ under the License.
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
     </service>
-    <service name="addProductCategoryToCategories" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="addProductCategoryToCategories" auth="true">
+    <service name="addProductCategoryToCategories" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="addProductCategoryToCategories" auth="true">
         <description>Add ProductCategory To Categories</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="categories" type="Object" mode="IN" optional="false"/>
@@ -843,8 +843,8 @@ under the License.
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
     </service>
-    <service name="updateProductCategoryToCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="updateProductCategoryToCategory" auth="true">
+    <service name="updateProductCategoryToCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="updateProductCategoryToCategory" auth="true">
         <description>Update ProductCategory To Category</description>
         <attribute name="productCategoryId" type="String" mode="INOUT" optional="false"/>
         <attribute name="parentProductCategoryId" type="String" mode="IN" optional="false"/>
@@ -852,8 +852,8 @@ under the License.
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
     </service>
-    <service name="removeProductCategoryFromCategory" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="removeProductCategoryFromCategory" auth="true">
+    <service name="removeProductCategoryFromCategory" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="removeProductCategoryFromCategory" auth="true">
         <description>Remove ProductCategory From Category</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="parentProductCategoryId" type="String" mode="IN" optional="false"/>
@@ -861,27 +861,27 @@ under the License.
     </service>
 
     <!-- Product Category Attribute SErvices -->
-    <service name="createProductCategoryAttribute" default-entity-name="ProductCategoryAttribute" engine="simple"
-            location="component://product/minilang/product/category/CategoryServices.xml"
+    <service name="createProductCategoryAttribute" default-entity-name="ProductCategoryAttribute" engine="groovy"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy"
             invoke="createProductCategoryAttribute" auth="true">
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateProductCategoryAttribute" default-entity-name="ProductCategoryAttribute" engine="simple"
-            location="component://product/minilang/product/category/CategoryServices.xml"
+    <service name="updateProductCategoryAttribute" default-entity-name="ProductCategoryAttribute" engine="groovy"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy"
             invoke="updateProductCategoryAttribute" auth="true">
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductCategoryAttribute" default-entity-name="ProductCategoryAttribute" engine="simple"
-            location="component://product/minilang/product/category/CategoryServices.xml"
+    <service name="deleteProductCategoryAttribute" default-entity-name="ProductCategoryAttribute" engine="groovy"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy"
             invoke="deleteProductCategoryAttribute" auth="true">
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- Product Category Link Services -->
-    <service name="createProductCategoryLink" default-entity-name="ProductCategoryLink" engine="simple"
-            location="component://product/minilang/product/category/CategoryServices.xml"
+    <service name="createProductCategoryLink" default-entity-name="ProductCategoryLink" engine="groovy"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy"
             invoke="createProductCategoryLink" auth="true">
         <description>Create a ProductCategoryLink</description>
         <permission-service service-name="productCategoryGenericPermission" main-action="CREATE"/>
@@ -897,16 +897,14 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductCategoryLink" default-entity-name="ProductCategoryLink" engine="simple"
-            location="component://product/minilang/product/category/CategoryServices.xml"
-            invoke="deleteProductCategoryLink" auth="true">
+    <service name="deleteProductCategoryLink" default-entity-name="ProductCategoryLink" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete a ProductCategoryLink</description>
         <permission-service service-name="productCategoryGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="duplicateCategoryEntities" engine="simple"
-                location="component://product/minilang/product/category/CategoryServices.xml" invoke="duplicateCategoryEntities" auth="true">
+    <service name="duplicateCategoryEntities" engine="groovy"
+                location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="duplicateCategoryEntities" auth="true">
         <description>Duplicates a named entity from one productCategoryId to another</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="productCategoryIdTo" type="String" mode="IN" optional="false"/>
@@ -1246,16 +1244,16 @@ under the License.
         location="component://product/minilang/product/product/ProductServices.xml" invoke="productGenericPermission">
         <implements service="permissionInterface"/>
     </service>
-    <service name="productCategoryGenericPermission" engine="simple"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="productCategoryGenericPermission">
+    <service name="productCategoryGenericPermission" engine="groovy"
+        location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="productCategoryGenericPermission">
         <implements service="permissionInterface"/>
     </service>
     <service name="productPriceGenericPermission" engine="simple"
         location="component://product/minilang/product/product/ProductServices.xml" invoke="productPriceGenericPermission">
         <implements service="permissionInterface"/>
     </service>
-    <service name="checkCategoryPermissionWithViewPurchaseAllow" engine="simple"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="checkCategoryPermissionWithViewPurchaseAllow">
+    <service name="checkCategoryPermissionWithViewPurchaseAllow" engine="groovy"
+        location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="checkCategoryPermissionWithViewPurchaseAllow">
         <implements service="permissionInterface"/>
         <attribute type="String" mode="IN" name="productCategoryId" optional="true"/>
     </service>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_maint.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_maint.xml?rev=1822912&r1=1822911&r2=1822912&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_maint.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_maint.xml Thu Feb  1 22:33:59 2018
@@ -25,22 +25,22 @@ under the License.
     <version>1.0</version>
 
     <!-- Product Category Maintenance Services -->
-    <service name="copyCategoryProductMembers" engine="simple" transaction-timeout="600"
-            location="component://product/minilang/product/category/CategoryServices.xml" invoke="copyCategoryProductMembers" auth="true">
+    <service name="copyCategoryProductMembers" engine="groovy" transaction-timeout="600"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="copyCategoryProductMembers" auth="true">
         <description>Copy Product Members from one Category to Another, optionally filtering by the given valid date (otherwise no date filtering done), and optionally recursing (if recurse=Y) down the from category</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="productCategoryIdTo" type="String" mode="IN" optional="false"/>
         <attribute name="validDate" type="Timestamp" mode="IN" optional="true"/>
         <attribute name="recurse" type="String" mode="IN" optional="true"/>
     </service>
-    <service name="expireAllCategoryProductMembers" engine="simple"
-            location="component://product/minilang/product/category/CategoryServices.xml" invoke="expireAllCategoryProductMembers" auth="true">
+    <service name="expireAllCategoryProductMembers" engine="groovy"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="expireAllCategoryProductMembers" auth="true">
         <description>Expire All Product Members in a Category optionally using the thruDate specified as the expire date (now timestamp used by default)</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
     </service>
-    <service name="removeExpiredCategoryProductMembers" engine="simple"
-            location="component://product/minilang/product/category/CategoryServices.xml" invoke="removeExpiredCategoryProductMembers" auth="true">
+    <service name="removeExpiredCategoryProductMembers" engine="groovy"
+            location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="removeExpiredCategoryProductMembers" auth="true">
         <description>Remove All Expired Product Members in a Category, optionally uses the valid date instead of now to determine if the member has expired</description>
         <attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
         <attribute name="validDate" type="Timestamp" mode="IN" optional="true"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_view.xml?rev=1822912&r1=1822911&r2=1822912&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_view.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_view.xml Thu Feb  1 22:33:59 2018
@@ -117,8 +117,8 @@ under the License.
         <attribute name="categoryMembers" type="java.util.Collection" mode="OUT"/>
     </service>
     
-    <service name="getAssociatedProductsList" engine="simple" auth="false"
-        location="component://product/minilang/product/category/CategoryServices.xml" invoke="getAssociatedProductsList">
+    <service name="getAssociatedProductsList" engine="groovy" auth="false"
+        location="component://product/groovyScripts/product/category/CategoryServices.groovy" invoke="getAssociatedProductsList">
         <description>Set the product options for selected product category, mostly used by getDependentDropdownValues</description>
         <attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
         <attribute name="products" mode="OUT" type="java.util.List"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml?rev=1822912&r1=1822911&r2=1822912&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/CommonUiLabels.xml Thu Feb  1 22:33:59 2018
@@ -4882,6 +4882,11 @@
         <value xml:lang="zh">安全错误:要运行${resourceDescription},你必须具有下列权限之一:${primaryPermission}_${mainAction}、${primaryPermission}_ADMIN${altPermissionList}</value>
         <value xml:lang="zh-TW">安全錯誤:要執行${resourceDescription},你必須具有下列權限之一:${primaryPermission}_${mainAction}、${primaryPermission}_ADMIN${altPermissionList}</value>
     </property>
+    <property key="CommonCallingMethodPermissionError">
+        <value xml:lang="de">Sicherheitsfehler: Um ${callingMethodName} ausführen zu können, müssen Sie folgende Berechtigung besitzen: ${permission}</value>
+        <value xml:lang="en">Security Error: to run ${callingMethodName} you must have the ${permission} permission.</value>
+        <value xml:lang="fr">Erreur sécurité : l'appel à ${callingMethodName} ne peut se faire car nous n'avez pas la permission ${permission}.</value>
+    </property>
     <property key="CommonGenericServiceErrorMessage">
         <value xml:lang="ar">خطأ في تشغيل الخدمة</value>
         <value xml:lang="cs">Chyba při spouÅ¡tění služby</value>