This is an automated email from the ASF dual-hosted git repository.

wpaetzold pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 9303de5e88da6a80fe4a3a1ef75fad181619ff0a
Author: Wiebke Pätzold <wiebke.paetz...@ecomify.de>
AuthorDate: Thu Jul 6 12:17:55 2023 +0200

    Improved: Renames some groovy scripts (OFBIZ-12813)
    
    This is a preprocessing step for the package declaration in groovy
    scripts since there should no duplicated classes
---
 ...rvices.groovy => CategoryServicesScript.groovy} |   0
 ....groovy => ProductFeatureServicesScript.groovy} |   0
 ...groovy => ImageManagementServicesScript.groovy} |   0
 ...vices.groovy => InventoryServicesScript.groovy} |   0
 ...eServices.groovy => PriceServicesScript.groovy} |   0
 ...ervices.groovy => ProductServicesScript.groovy} |   0
 ...oServices.groovy => PromoServicesScript.groovy} |   0
 ...es.groovy => SubscriptionServicesScript.groovy} |   0
 ...groovy => SupplierProductServicesScript.groovy} |   0
 applications/product/servicedef/services.xml       | 128 ++++++++++-----------
 .../product/servicedef/services_facility.xml       |   6 +-
 .../product/servicedef/services_feature.xml        |   6 +-
 applications/product/servicedef/services_maint.xml |   6 +-
 .../product/servicedef/services_pricepromo.xml     |  10 +-
 .../product/servicedef/services_subscription.xml   |  10 +-
 applications/product/servicedef/services_view.xml  |   2 +-
 ...roovy => WorkEffortContentWrapperScript.groovy} |   0
 ...ices.groovy => WorkEffortServicesScript.groovy} |   0
 applications/workeffort/servicedef/services.xml    |   4 +-
 19 files changed, 86 insertions(+), 86 deletions(-)

diff --git 
a/applications/product/groovyScripts/product/category/CategoryServices.groovy 
b/applications/product/groovyScripts/product/category/CategoryServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/category/CategoryServices.groovy
rename to 
applications/product/groovyScripts/product/category/CategoryServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/feature/ProductFeatureServices.groovy
 
b/applications/product/groovyScripts/product/feature/ProductFeatureServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/feature/ProductFeatureServices.groovy
rename to 
applications/product/groovyScripts/product/feature/ProductFeatureServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy
 
b/applications/product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy
rename to 
applications/product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/inventory/InventoryServices.groovy 
b/applications/product/groovyScripts/product/inventory/InventoryServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/inventory/InventoryServices.groovy
rename to 
applications/product/groovyScripts/product/inventory/InventoryServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/price/PriceServices.groovy 
b/applications/product/groovyScripts/product/price/PriceServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/price/PriceServices.groovy
rename to 
applications/product/groovyScripts/product/price/PriceServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/product/ProductServices.groovy 
b/applications/product/groovyScripts/product/product/ProductServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/product/ProductServices.groovy
rename to 
applications/product/groovyScripts/product/product/ProductServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/promo/PromoServices.groovy 
b/applications/product/groovyScripts/product/promo/PromoServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/promo/PromoServices.groovy
rename to 
applications/product/groovyScripts/product/promo/PromoServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/subscription/SubscriptionServices.groovy
 
b/applications/product/groovyScripts/product/subscription/SubscriptionServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/subscription/SubscriptionServices.groovy
rename to 
applications/product/groovyScripts/product/subscription/SubscriptionServicesScript.groovy
diff --git 
a/applications/product/groovyScripts/product/supplier/SupplierProductServices.groovy
 
b/applications/product/groovyScripts/product/supplier/SupplierProductServicesScript.groovy
similarity index 100%
rename from 
applications/product/groovyScripts/product/supplier/SupplierProductServices.groovy
rename to 
applications/product/groovyScripts/product/supplier/SupplierProductServicesScript.groovy
diff --git a/applications/product/servicedef/services.xml 
b/applications/product/servicedef/services.xml
index c179ef4842..03c73710e4 100644
--- a/applications/product/servicedef/services.xml
+++ b/applications/product/servicedef/services.xml
@@ -38,7 +38,7 @@ under the License.
         <override name="longDescription" allow-html="safe"/>
     </service>
     <service name="createProduct" default-entity-name="Product" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="createProduct" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="createProduct" auth="true">
         <description>Create a Product</description>
         <implements service="interfaceProduct"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
@@ -46,13 +46,13 @@ under the License.
         <override name="internalName" optional="false"/>
     </service>
     <service name="updateProduct" default-entity-name="Product" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="updateProduct" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="updateProduct" auth="true">
         <description>Update a Product</description>
         <implements service="interfaceProduct"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="updateProductQuickAdminName" default-entity-name="Product" 
engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="updateProductQuickAdminName" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="updateProductQuickAdminName" auth="true">
         <description>Update a Product from Quick Admin</description>
         <implements service="interfaceProduct"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -64,7 +64,7 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="duplicateProduct" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="duplicateProduct" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="duplicateProduct" auth="true">
         <description>Duplicate a Product using a new productId</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="oldProductId" type="String" mode="IN" 
optional="false"/>
@@ -90,7 +90,7 @@ under the License.
         <attribute name="removeInventoryItems" type="String" mode="IN" 
optional="true"/>
     </service>
     <service name="copyToProductVariants" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="copyToProductVariants" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="copyToProductVariants" auth="true">
         <description>Copy Virtual Product's data to the Variant 
Products</description>
         <attribute name="virtualProductId" type="String" mode="IN" 
optional="false"/>
         <attribute name="removeBefore" type="String" mode="IN" 
optional="true"/>
@@ -152,39 +152,39 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="deleteProductKeywords" engine="groovy"
-            
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="deleteProductKeywords" auth="true">
+            
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="deleteProductKeywords" auth="true">
         <description>Delete all the keywords of a product</description>
         <permission-service service-name="productGenericPermission" 
main-action="DELETE"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="indexProductKeywords" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="indexProductKeywords" auth="false">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="indexProductKeywords" auth="false">
         <description>Index the Keywords for a Product</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="productInstance" 
type="org.apache.ofbiz.entity.GenericValue" mode="IN" optional="true"/>
     </service>
     <service name="forceIndexProductKeywords" engine="groovy"
-            
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="forceIndexProductKeywords" auth="true">
+            
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="forceIndexProductKeywords" auth="true">
         <description>Induce all the keywords of a product, ignoring the flag 
in the Product.autoCreateKeywords flag</description>
         <permission-service service-name="productGenericPermission" 
main-action="CREATE"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
     </service>
 
     <service name="discontinueProductSales" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="discontinueProductSales" auth="false">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="discontinueProductSales" auth="false">
         <description>Discontinue Product Sales</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
     </service>
 
     <service name="countProductView" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="countProductView" auth="false">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="countProductView" auth="false">
         <description>count Product View</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="weight" type="Long" mode="IN" optional="true"/>
     </service>
 
     <service name="createProductReview" engine="groovy"
-            
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="createProductReview" auth="true">
+            
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="createProductReview" auth="true">
         <description>Create a product review entity</description>
         <auto-attributes entity-name="ProductReview" mode="IN" include="nonpk" 
optional="true"/>
         <attribute name="productReviewId" type="String" mode="OUT" 
optional="false"/>
@@ -193,7 +193,7 @@ under the License.
         <override name="productRating" optional="false"/>
     </service>
     <service name="updateProductReview" engine="groovy" 
default-entity-name="ProductReview"
-            
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="updateProductReview" auth="true">
+            
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="updateProductReview" auth="true">
         <description>Updates a product review record</description>
         <required-permissions join-type="OR">
             <check-permission permission="CATALOG_UPDATE"/>
@@ -203,7 +203,7 @@ under the License.
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
     <service name="setProductReviewStatus" engine="groovy"
-            
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="setProductReviewStatus" auth="true">
+            
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="setProductReviewStatus" auth="true">
         <description>Updates a product review record</description>
         <required-permissions join-type="OR">
             <check-permission permission="CATALOG_UPDATE"/>
@@ -243,7 +243,7 @@ under the License.
 
     <!-- Product Price Services -->
     <service name="createProductPrice" default-entity-name="ProductPrice" 
engine="groovy"
-                
location="component://product/groovyScripts/product/price/PriceServices.groovy" 
invoke="createProductPrice" auth="true">
+                
location="component://product/groovyScripts/product/price/PriceServicesScript.groovy"
 invoke="createProductPrice" auth="true">
         <description>
             Create a Product Price.
 
@@ -270,7 +270,7 @@ under the License.
         <override name="price" optional="false"/>
     </service>
     <service name="updateProductPrice" default-entity-name="ProductPrice" 
engine="groovy"
-                
location="component://product/groovyScripts/product/price/PriceServices.groovy" 
invoke="updateProductPrice" auth="true">
+                
location="component://product/groovyScripts/product/price/PriceServicesScript.groovy"
 invoke="updateProductPrice" auth="true">
         <description>Update an ProductPrice</description>
         <permission-service service-name="checkProductRelatedPermission" 
main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -287,7 +287,7 @@ under the License.
         <override name="price" optional="false"/>
     </service>
     <service name="deleteProductPrice" default-entity-name="ProductPrice" 
engine="groovy"
-                
location="component://product/groovyScripts/product/price/PriceServices.groovy" 
invoke="deleteProductPrice" auth="true">
+                
location="component://product/groovyScripts/product/price/PriceServicesScript.groovy"
 invoke="deleteProductPrice" auth="true">
         <description>Delete an ProductPrice</description>
         <permission-service service-name="checkProductRelatedPermission" 
main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -529,7 +529,7 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
     <service name="getSupplierProductFeatures" engine="groovy" 
invoke="getSupplierProductFeatures"
-             
location="component://product/groovyScripts/product/supplier/SupplierProductServices.groovy">
+             
location="component://product/groovyScripts/product/supplier/SupplierProductServicesScript.groovy">
         <description>Finds a list of SupplierProductFeature entities based on 
the productFeatureId.
             If a partyId is given, only product feature information for that 
supplier party is returned.</description>
         <attribute name="productFeatureId" type="String" mode="IN"/>
@@ -666,14 +666,14 @@ under the License.
     <!-- Product Category Services -->
     <!-- ======================================== -->
     <service name="createProductCategory" 
default-entity-name="ProductCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="createProductCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="updateProductCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -681,7 +681,7 @@ under the License.
     </service>
 
     <service name="duplicateProductCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="duplicateProductCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -704,7 +704,7 @@ under the License.
     </service>
 
     <service name="addProductToCategories" 
default-entity-name="ProductCategoryMember" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="addProductToCategories" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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">
@@ -728,14 +728,14 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeProductFromCategory" 
default-entity-name="ProductCategoryMember" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="removeProductFromCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="createProductInCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -748,7 +748,7 @@ under the License.
     </service>
 
     <service name="addPartyToCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="addPartyToCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -758,7 +758,7 @@ under the License.
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>
     <service name="updatePartyToCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="updatePartyToCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -768,7 +768,7 @@ under the License.
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>
     <service name="removePartyFromCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="removePartyFromCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -777,7 +777,7 @@ under the License.
     </service>
 
     <service name="addPartyToProduct" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="addPartyToProduct" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="addPartyToProduct" auth="true">
         <description>Add Party To Product</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -788,7 +788,7 @@ under the License.
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>
     <service name="updatePartyToProduct" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="updatePartyToProduct" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="updatePartyToProduct" auth="true">
         <description>Update Party To Product</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -799,7 +799,7 @@ under the License.
         <attribute name="comments" type="String" mode="IN" optional="true"/>
     </service>
     <service name="removePartyFromProduct" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="removePartyFromProduct" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="removePartyFromProduct" auth="true">
         <description>Remove Party From Product</description>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
@@ -808,7 +808,7 @@ under the License.
     </service>
 
     <service name="safeAddProductCategoryToCategory" engine="groovy"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="addProductCategoryToCategory" auth="true">
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -818,7 +818,7 @@ under the License.
     </service>
 
     <service name="addProductCategoryToCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="addProductCategoryToCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -827,7 +827,7 @@ under the License.
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
     </service>
     <service name="addProductCategoryToCategories" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="addProductCategoryToCategories" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -836,7 +836,7 @@ under the License.
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
     </service>
     <service name="updateProductCategoryToCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="updateProductCategoryToCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -845,7 +845,7 @@ under the License.
         <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
     </service>
     <service name="removeProductCategoryFromCategory" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="removeProductCategoryFromCategory" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -854,26 +854,26 @@ under the License.
 
     <!-- Product Category Attribute SErvices -->
     <service name="createProductCategoryAttribute" 
default-entity-name="ProductCategoryAttribute" engine="groovy"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.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="groovy"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.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="groovy"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.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="groovy"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.groovy"
             invoke="createProductCategoryLink" auth="true">
         <description>Create a ProductCategoryLink</description>
         <permission-service service-name="productCategoryGenericPermission" 
main-action="CREATE"/>
@@ -896,7 +896,7 @@ under the License.
     </service>
 
     <service name="duplicateCategoryEntities" engine="groovy"
-                
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="duplicateCategoryEntities" auth="true">
+                
location="component://product/groovyScripts/product/category/CategoryServicesScript.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"/>
@@ -1227,19 +1227,19 @@ under the License.
 
     <!-- Permission Services -->
     <service name="productGenericPermission" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="productGenericPermission">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="productGenericPermission">
         <implements service="permissionInterface"/>
     </service>
     <service name="productCategoryGenericPermission" engine="groovy"
-        
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="productCategoryGenericPermission">
+        
location="component://product/groovyScripts/product/category/CategoryServicesScript.groovy"
 invoke="productCategoryGenericPermission">
         <implements service="permissionInterface"/>
     </service>
     <service name="productPriceGenericPermission" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="productPriceGenericPermission">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="productPriceGenericPermission">
         <implements service="permissionInterface"/>
     </service>
     <service name="checkCategoryPermissionWithViewPurchaseAllow" 
engine="groovy"
-        
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="checkCategoryPermissionWithViewPurchaseAllow">
+        
location="component://product/groovyScripts/product/category/CategoryServicesScript.groovy"
 invoke="checkCategoryPermissionWithViewPurchaseAllow">
         <implements service="permissionInterface"/>
         <attribute type="String" mode="IN" name="productCategoryId" 
optional="true"/>
     </service>
@@ -1272,19 +1272,19 @@ under the License.
 
     <!-- ProductCategoryGlAccount Services -->
     <service name="createProductCategoryGlAccount" 
default-entity-name="ProductCategoryGlAccount" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="createProductCategoryGlAccount" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="createProductCategoryGlAccount" auth="true">
         <description>Create a ProductCategoryGlAccount</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
     </service>
     <service name="updateProductCategoryGlAccount" 
default-entity-name="ProductCategoryGlAccount" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="updateProductCategoryGlAccount" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="updateProductCategoryGlAccount" auth="true">
         <description>Update a ProductCategoryGlAccount</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
     </service>
     <service name="deleteProductCategoryGlAccount" 
default-entity-name="ProductCategoryGlAccount" engine="groovy"
-                
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="deleteProductCategoryGlAccount" auth="true">
+                
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="deleteProductCategoryGlAccount" auth="true">
         <description>Delete a ProductCategoryGlAccount</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
@@ -1381,7 +1381,7 @@ under the License.
     </service>
 
     <service name="multipleUploadProductImages" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="uploadProductImages" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="uploadProductImages" auth="true">
         <description>Multiple upload Images For Product</description>
         <permission-service service-name="genericContentPermission" 
main-action="CREATE"/>
         <attribute name="productId" type="String" mode="INOUT" 
optional="false"/>
@@ -1419,14 +1419,14 @@ under the License.
     </service>
 
     <service name="removeProductContentAndImageFile" 
default-entity-name="ProductContent" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="removeProductContentAndImageFile" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="removeProductContentAndImageFile" auth="true">
         <description>Remove Content From Product and File Image</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <service name="removeProductContentForImageManagement" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="removeProductContentForImageManagement" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="removeProductContentForImageManagement" auth="true">
         <description>Delete Product Content Relationship Entity</description>
         <attribute mode="IN" name="contentId" optional="false" type="String"/>
         <attribute mode="IN" name="productId" optional="false" type="String"/>
@@ -1478,7 +1478,7 @@ under the License.
     </service>
 
     <service name="setImageDetail" engine="groovy" 
default-entity-name="ProductContent"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="setImageDetail" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="setImageDetail" auth="true">
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="sequenceNum" mode="IN" type="Integer" 
optional="true"/>
@@ -1487,29 +1487,29 @@ under the License.
     </service>
 
     <service name="updateStatusImageManagement" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="updateStatusImageManagement" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="updateStatusImageManagement" auth="true">
         <attribute name="contentId" mode="IN" type="String" optional="false"/>
         <attribute name="checkStatusId" mode="IN" type="String" 
optional="true"/>
     </service>
 
     <service name="addRejectedReasonImageManagement" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="addRejectedReasonImageManagement" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="addRejectedReasonImageManagement" auth="true">
         <attribute name="contentId" mode="IN" type="String" optional="false"/>
         <attribute name="description" mode="IN" type="String" optional="true"/>
     </service>
 
     <service name="createImageContentApproval" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="createImageContentApproval" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="createImageContentApproval" auth="true">
         <attribute name="contentId" mode="IN" type="String" optional="false"/>
     </service>
 
     <service name="removeImageContentApproval" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="removeImageContentApproval" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="removeImageContentApproval" auth="true">
         <attribute name="partyId" mode="IN" type="String" optional="false"/>
     </service>
 
     <service name="resizeImages" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="resizeImages" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="resizeImages" auth="true">
         <description>Resize Images.</description>
         <attribute name="resizeOption" mode="IN" type="String" 
optional="false"/>
         <attribute name="productId" mode="IN" type="String" optional="false"/>
@@ -1535,7 +1535,7 @@ under the License.
     </service>
 
     <service name="removeImageBySize" engine="groovy"
-        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServices.groovy"
 invoke="removeImageBySize" auth="true">
+        
location="component://product/groovyScripts/product/imagemanagement/ImageManagementServicesScript.groovy"
 invoke="removeImageBySize" auth="true">
         <description>Remove Image By Size.</description>
         <attribute name="productId" mode="IN" type="String" optional="false"/>
         <attribute name="mapKey" mode="IN" type="String" optional="false"/>
@@ -1594,47 +1594,47 @@ under the License.
 
     <!-- Product GroupOrder Services -->
     <service name="createProductGroupOrder" 
default-entity-name="ProductGroupOrder" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="createProductGroupOrder" auth="true">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="createProductGroupOrder" auth="true">
         <description>Create ProductGroupOrder</description>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <service name="updateProductGroupOrder" 
default-entity-name="ProductGroupOrder" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="updateProductGroupOrder" auth="true">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="updateProductGroupOrder" auth="true">
         <description>Update ProductGroupOrder</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <service name="deleteProductGroupOrder" 
default-entity-name="ProductGroupOrder" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="deleteProductGroupOrder" auth="true">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="deleteProductGroupOrder" auth="true">
         <description>Delete ProductGroupOrder</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="createJobForProductGroupOrder" 
default-entity-name="ProductGroupOrder" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="createJobForProductGroupOrder" auth="true">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="createJobForProductGroupOrder" auth="true">
         <description>Create Job For ProductGroupOrder</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <service name="checkOrderItemForProductGroupOrder" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="checkOrderItemForProductGroupOrder" auth="true">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="checkOrderItemForProductGroupOrder" auth="true">
         <description>Check OrderItem For ProductGroupOrder</description>
         <attribute name="orderId" mode="IN" type="String" optional="false"/>
     </service>
 
     <service name="cancleOrderItemGroupOrder" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="cancleOrderItemGroupOrder" auth="true">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="cancleOrderItemGroupOrder" auth="true">
         <description>Cancle OrderItemGroupOrder</description>
         <attribute name="orderId" mode="IN" type="String" optional="false"/>
         <attribute name="orderItemSeqId" type="String" mode="IN" 
optional="true"/>
     </service>
 
     <service name="checkProductGroupOrderExpired" engine="groovy"
-        
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="checkProductGroupOrderExpired" auth="true">
+        
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="checkProductGroupOrderExpired" auth="true">
         <description>Check ProductGroupOrder Expired</description>
         <attribute name="groupOrderId" mode="IN" type="String" 
optional="false"/>
     </service>
@@ -1828,7 +1828,7 @@ under the License.
     <!--Permission services -->
 
     <service name="checkProductRelatedPermission" engine="groovy"
-             
location="component://product/groovyScripts/product/product/ProductServices.groovy"
 invoke="checkProductRelatedPermissionService">
+             
location="component://product/groovyScripts/product/product/ProductServicesScript.groovy"
 invoke="checkProductRelatedPermissionService">
         <description>Check Product Related Permission, a service to centralize 
product security code</description>
         <implements service="permissionInterface"/>
         <attribute name="productId" mode="IN" type="String" optional="true"/>
diff --git a/applications/product/servicedef/services_facility.xml 
b/applications/product/servicedef/services_facility.xml
index f0696c83b3..3505c42190 100644
--- a/applications/product/servicedef/services_facility.xml
+++ b/applications/product/servicedef/services_facility.xml
@@ -26,17 +26,17 @@ under the License.
 
     <!-- Permission Services -->
     <service name="facilityGenericPermission" engine="groovy"
-        
location="component://product/groovyScripts/product/inventory/InventoryServices.groovy"
 invoke="facilityGenericPermission">
+        
location="component://product/groovyScripts/product/inventory/InventoryServicesScript.groovy"
 invoke="facilityGenericPermission">
         <implements service="permissionInterface"/>
     </service>
     <service name="checkProductFacilityRelatedPermission" engine="groovy"
-            
location="component://product/groovyScripts/product/inventory/InventoryServices.groovy"
 invoke="checkProductFacilityRelatedPermission">
+            
location="component://product/groovyScripts/product/inventory/InventoryServicesScript.groovy"
 invoke="checkProductFacilityRelatedPermission">
         <description>ProductFacility Permission Checking Logic</description>
         <implements service="permissionInterface"/>
     </service>
     <!-- Product Inventory Services -->
     <service name="createInventoryItem" default-entity-name="InventoryItem" 
engine="groovy"
-                
location="component://product/groovyScripts/product/inventory/InventoryServices.groovy"
 invoke="createInventoryItem" auth="true">
+                
location="component://product/groovyScripts/product/inventory/InventoryServicesScript.groovy"
 invoke="createInventoryItem" auth="true">
         <description>Create an InventoryItem</description>
         <permission-service service-name="facilityGenericPermission" 
main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
diff --git a/applications/product/servicedef/services_feature.xml 
b/applications/product/servicedef/services_feature.xml
index ef5300056e..58002819e6 100644
--- a/applications/product/servicedef/services_feature.xml
+++ b/applications/product/servicedef/services_feature.xml
@@ -78,7 +78,7 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="applyFeatureToProductFromTypeAndCode" engine="groovy"
-                
location="component://product/groovyScripts/product/feature/ProductFeatureServices.groovy"
 invoke="applyFeatureToProductFromTypeAndCode" auth="true">
+                
location="component://product/groovyScripts/product/feature/ProductFeatureServicesScript.groovy"
 invoke="applyFeatureToProductFromTypeAndCode" auth="true">
         <description>Apply a ProductFeature to a Product</description>
         <permission-service service-name="checkProductRelatedPermission" 
main-action="CREATE"/>
         <attribute name="productId" type="String" mode="IN" optional="false">
@@ -194,7 +194,7 @@ under the License.
     </service>
     <!-- ProductFeatureType Services -->
     <service name="createProductFeatureType" 
default-entity-name="ProductFeatureType" engine="groovy"
-                
location="component://product/groovyScripts/product/feature/ProductFeatureServices.groovy"
 invoke="createProductFeatureType" auth="true">
+                
location="component://product/groovyScripts/product/feature/ProductFeatureServicesScript.groovy"
 invoke="createProductFeatureType" auth="true">
         <description>Create a ProductFeatureType</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -213,7 +213,7 @@ under the License.
     </service>
     <!-- ProductFeatureApplAttr  -->
     <service name="createProductFeatureApplAttr" 
default-entity-name="ProductFeatureApplAttr" engine="groovy"
-                
location="component://product/groovyScripts/product/feature/ProductFeatureServices.groovy"
 invoke="createProductFeatureApplAttr" auth="true">
+                
location="component://product/groovyScripts/product/feature/ProductFeatureServicesScript.groovy"
 invoke="createProductFeatureApplAttr" auth="true">
         <description>Create a ProductFeatureApplAttr</description>
         <permission-service service-name="productGenericPermission" 
main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
diff --git a/applications/product/servicedef/services_maint.xml 
b/applications/product/servicedef/services_maint.xml
index 43df0dce79..928652c36d 100644
--- a/applications/product/servicedef/services_maint.xml
+++ b/applications/product/servicedef/services_maint.xml
@@ -26,7 +26,7 @@ under the License.
 
     <!-- Product Category Maintenance Services -->
     <service name="copyCategoryProductMembers" engine="groovy" 
transaction-timeout="600"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="copyCategoryProductMembers" auth="true">
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.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">
             <type-validate>
@@ -42,7 +42,7 @@ under the License.
         <attribute name="recurse" type="String" mode="IN" optional="true"/>
     </service>
     <service name="expireAllCategoryProductMembers" engine="groovy"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="expireAllCategoryProductMembers" auth="true">
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.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">
             <type-validate>
@@ -52,7 +52,7 @@ under the License.
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
     </service>
     <service name="removeExpiredCategoryProductMembers" engine="groovy"
-            
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="removeExpiredCategoryProductMembers" auth="true">
+            
location="component://product/groovyScripts/product/category/CategoryServicesScript.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">
             <type-validate>
diff --git a/applications/product/servicedef/services_pricepromo.xml 
b/applications/product/servicedef/services_pricepromo.xml
index 5f3f8fc297..cfe1c95798 100644
--- a/applications/product/servicedef/services_pricepromo.xml
+++ b/applications/product/servicedef/services_pricepromo.xml
@@ -88,7 +88,7 @@ under the License.
     </service>
 
     <service name="createProductPriceCond" 
default-entity-name="ProductPriceCond" engine="groovy"
-                
location="component://product/groovyScripts/product/price/PriceServices.groovy" 
invoke="createProductPriceCond" auth="true">
+                
location="component://product/groovyScripts/product/price/PriceServicesScript.groovy"
 invoke="createProductPriceCond" auth="true">
         <description>Create a ProductPriceCond</description>
         <permission-service service-name="productPriceGenericPermission" 
main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -97,7 +97,7 @@ under the License.
         <override name="productPriceCondSeqId" mode="OUT"/>
     </service>
     <service name="updateProductPriceCond" 
default-entity-name="ProductPriceCond" engine="groovy"
-                
location="component://product/groovyScripts/product/price/PriceServices.groovy" 
invoke="updateProductPriceCond" auth="true">
+                
location="component://product/groovyScripts/product/price/PriceServicesScript.groovy"
 invoke="updateProductPriceCond" auth="true">
         <description>Update a ProductPriceCond</description>
         <permission-service service-name="productPriceGenericPermission" 
main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -258,7 +258,7 @@ under the License.
     </service>
     
     <service name="createProductPromoCond" 
default-entity-name="ProductPromoCond" engine="groovy" 
invoke="createProductPromoCond"
-             
location="component://product/groovyScripts/product/promo/PromoServices.groovy" 
auth="true">
+             
location="component://product/groovyScripts/product/promo/PromoServicesScript.groovy"
 auth="true">
         <description>Create a ProductPromo</description>
         <permission-service service-name="productPriceGenericPermission" 
main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN"/>
@@ -267,7 +267,7 @@ under the License.
         <override name="productPromoCondSeqId" mode="OUT"/>
     </service>
     <service name="updateProductPromoCond" 
default-entity-name="ProductPromoCond" engine="groovy" 
invoke="updateProductPromoCond"
-             
location="component://product/groovyScripts/product/promo/PromoServices.groovy" 
auth="true">
+             
location="component://product/groovyScripts/product/promo/PromoServicesScript.groovy"
 auth="true">
         <description>Update a ProductPromo</description>
         <permission-service service-name="productPriceGenericPermission" 
main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN"/>
@@ -332,7 +332,7 @@ under the License.
     </service>
 
     <service name="getAssociatedPriceRulesConds" engine="groovy" auth="false"
-        
location="component://product/groovyScripts/product/price/PriceServices.groovy" 
invoke="getAssociatedPriceRulesConds">
+        
location="component://product/groovyScripts/product/price/PriceServicesScript.groovy"
 invoke="getAssociatedPriceRulesConds">
         <description>Set the Value options for selected Price Rule Condition 
Input</description>
         <attribute name="inputParamEnumId" mode="IN" type="String"/>
         <attribute name="productPriceRulesCondValues" mode="OUT" 
type="java.util.List" optional="true"/><!-- optional="true" because of quantity 
or other kind of fiels needing an input -->
diff --git a/applications/product/servicedef/services_subscription.xml 
b/applications/product/servicedef/services_subscription.xml
index deddc18615..f838600367 100644
--- a/applications/product/servicedef/services_subscription.xml
+++ b/applications/product/servicedef/services_subscription.xml
@@ -24,7 +24,7 @@ under the License.
     <vendor>OFBiz</vendor>
 
     <service name="createSubscription" default-entity-name="Subscription" 
auth="true" engine="groovy"
-        
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy"
 invoke="createSubscription">
+        
location="component://product/groovyScripts/product/subscription/SubscriptionServicesScript.groovy"
 invoke="createSubscription">
         <description>Create a Subscription Record</description>
         <permission-service service-name="subscriptionPermissionCheck" 
main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
@@ -38,7 +38,7 @@ under the License.
     </service>
 
     <service name="isSubscribed" default-entity-name="Subscription" 
auth="true" engine="groovy"
-        
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy"
 invoke="isSubscribed">
+        
location="component://product/groovyScripts/product/subscription/SubscriptionServicesScript.groovy"
 invoke="isSubscribed">
         <description>Check if a particular party has at this moment a 
subscription</description>
         <permission-service service-name="subscriptionPermissionCheck" 
main-action="VIEW"/>
         <auto-attributes include="all" mode="IN" optional="true"/>
@@ -49,7 +49,7 @@ under the License.
     </service>
 
     <service name="getSubscriptionEnt" default-entity-name="Subscription" 
auth="true" engine="groovy"
-        
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy"
 invoke="getSubscription">
+        
location="component://product/groovyScripts/product/subscription/SubscriptionServicesScript.groovy"
 invoke="getSubscription">
         <description>Retrieve a single Subscription Entity Record</description>
         <permission-service service-name="subscriptionPermissionCheck" 
main-action="VIEW"/>
         <auto-attributes include="pk" mode="INOUT" optional="false"/>
@@ -131,7 +131,7 @@ under the License.
         <auto-attributes include="pk" mode="INOUT" optional="false"/>
     </service>
     <service name="updateSubscriptionAttribute" 
default-entity-name="SubscriptionAttribute" auth="true" engine="groovy"
-             
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy"
 invoke="updateSubscriptionAttribute">
+             
location="component://product/groovyScripts/product/subscription/SubscriptionServicesScript.groovy"
 invoke="updateSubscriptionAttribute">
         <description>Create (when not exist) or update (when exist) a 
Subscription attribute</description>
         <permission-service service-name="subscriptionPermissionCheck" 
main-action="UPDATE"/>
         <attribute name="subscriptionId" type="String" mode="INOUT" 
optional="false">
@@ -163,7 +163,7 @@ under the License.
     </service>
 
     <service name="subscriptionPermissionCheck" engine="groovy"
-        
location="component://product/groovyScripts/product/subscription/SubscriptionServices.groovy"
 invoke="subscriptionPermissionCheck" auth="true">
+        
location="component://product/groovyScripts/product/subscription/SubscriptionServicesScript.groovy"
 invoke="subscriptionPermissionCheck" auth="true">
         <description>Subscription Permission Checking Logic</description>
         <implements service="permissionInterface"/>
     </service>
diff --git a/applications/product/servicedef/services_view.xml 
b/applications/product/servicedef/services_view.xml
index 58cf038c4e..229ac86ade 100644
--- a/applications/product/servicedef/services_view.xml
+++ b/applications/product/servicedef/services_view.xml
@@ -119,7 +119,7 @@ under the License.
     </service>
     
     <service name="getAssociatedProductsList" engine="groovy" auth="false"
-        
location="component://product/groovyScripts/product/category/CategoryServices.groovy"
 invoke="getAssociatedProductsList">
+        
location="component://product/groovyScripts/product/category/CategoryServicesScript.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">
             <type-validate>
diff --git 
a/applications/workeffort/groovyScripts/workeffort/content/WorkEffortContentWrapper.groovy
 
b/applications/workeffort/groovyScripts/workeffort/content/WorkEffortContentWrapperScript.groovy
similarity index 100%
rename from 
applications/workeffort/groovyScripts/workeffort/content/WorkEffortContentWrapper.groovy
rename to 
applications/workeffort/groovyScripts/workeffort/content/WorkEffortContentWrapperScript.groovy
diff --git 
a/applications/workeffort/groovyScripts/workeffort/workeffort/WorkEffortServices.groovy
 
b/applications/workeffort/groovyScripts/workeffort/workeffort/WorkEffortServicesScript.groovy
similarity index 100%
rename from 
applications/workeffort/groovyScripts/workeffort/workeffort/WorkEffortServices.groovy
rename to 
applications/workeffort/groovyScripts/workeffort/workeffort/WorkEffortServicesScript.groovy
diff --git a/applications/workeffort/servicedef/services.xml 
b/applications/workeffort/servicedef/services.xml
index e99e392c18..5e59be4674 100644
--- a/applications/workeffort/servicedef/services.xml
+++ b/applications/workeffort/servicedef/services.xml
@@ -464,13 +464,13 @@ under the License.
         <attribute name="workEfforts" type="java.util.List" mode="INOUT" 
optional="true"/>
     </service>
     <service name="checkAndCreateWorkEffort" auth="true" engine="groovy" 
default-entity-name="Shipment"
-             
location="component://workeffort/groovyScripts/workeffort/workeffort/WorkEffortServices.groovy"
 invoke="checkAndCreateWorkEffort">
+             
location="component://workeffort/groovyScripts/workeffort/workeffort/WorkEffortServicesScript.groovy"
 invoke="checkAndCreateWorkEffort">
         <description>Check And Create WorkEffort after Shipment 
Create</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="checkAndUpdateWorkEffort" auth="true" engine="groovy" 
default-entity-name="Shipment"
-             
location="component://workeffort/groovyScripts/workeffort/workeffort/WorkEffortServices.groovy"
 invoke="checkAndUpdateWorkEffort">
+             
location="component://workeffort/groovyScripts/workeffort/workeffort/WorkEffortServicesScript.groovy"
 invoke="checkAndUpdateWorkEffort">
         <description>Check And Update WorkEffort after Shipment 
Update</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>

Reply via email to