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 c7eeb0b70eb56952fb8d51ab2f1487e0f26eb8ea Author: Wiebke Pätzold <wiebke.paetz...@ecomify.de> AuthorDate: Tue Jul 25 20:32:28 2023 +0200 Improved: Renames some groovy scripts to avoid duplicate classes (OFBIZ-12813) --- .../accounting/servicedef/services_agreement.xml | 2 +- .../accounting/servicedef/services_invoice.xml | 6 +- .../accounting/servicedef/services_ledger.xml | 2 +- ...vices.groovy => AgreementServicesScript.groovy} | 0 ...ervices.groovy => InvoiceServicesScript.groovy} | 0 ...s.groovy => GeneralLedgerServicesScript.groovy} | 0 applications/content/servicedef/services.xml | 22 +++---- .../content/servicedef/services_commevent.xml | 4 +- .../content/servicedef/services_content.xml | 26 ++++---- applications/content/servicedef/services_data.xml | 6 +- ...ervices.groovy => ContentServicesScript.groovy} | 0 ...taServices.groovy => DataServicesScript.groovy} | 0 .../servicedef/services_production_run.xml | 10 +-- .../manufacturing/servicedef/services_routing.xml | 4 +- ...s.groovy => ProductionRunServicesScript.groovy} | 0 ...ervices.groovy => RoutingServicesScript.groovy} | 0 applications/order/servicedef/services.xml | 4 +- applications/order/servicedef/services_quote.xml | 38 ++++++------ .../order/servicedef/services_requirement.xml | 8 +-- applications/order/servicedef/services_return.xml | 48 +++++++-------- .../order/servicedef/services_shoppinglist.xml | 20 +++--- ...ces.groovy => OrderReturnServicesScript.groovy} | 0 ...rServices.groovy => OrderServicesScript.groovy} | 0 ...eServices.groovy => QuoteServicesScript.groovy} | 0 ...ces.groovy => RequirementServicesScript.groovy} | 0 ...es.groovy => ShoppingListServicesScript.groovy} | 0 applications/party/servicedef/services.xml | 72 +++++++++++----------- applications/party/servicedef/services_contact.xml | 18 +++--- applications/party/servicedef/services_view.xml | 10 +-- ...ovy => CommunicationEventServicesScript.groovy} | 0 ...ces.groovy => ContactMechServicesScript.groovy} | 0 ...yServices.groovy => PartyServicesScript.groovy} | 0 applications/product/servicedef/services.xml | 38 ++++++------ framework/common/servicedef/services.xml | 34 +++++----- framework/common/servicedef/services_email.xml | 2 +- ...Services.groovy => CommonServicesScript.groovy} | 0 ...lServices.groovy => EmailServicesScript.groovy} | 0 37 files changed, 187 insertions(+), 187 deletions(-) diff --git a/applications/accounting/servicedef/services_agreement.xml b/applications/accounting/servicedef/services_agreement.xml index 5129b16ddb..6dc55d7f24 100644 --- a/applications/accounting/servicedef/services_agreement.xml +++ b/applications/accounting/servicedef/services_agreement.xml @@ -44,7 +44,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="copyAgreement" default-entity-name="Agreement" engine="groovy" - location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/agreement/AgreementServices.groovy" invoke="copyAgreement" auth="true"> + location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/agreement/AgreementServicesScript.groovy" invoke="copyAgreement" auth="true"> <description>Copy an Agreement</description> <permission-service service-name="acctgAgreementPermissionCheck" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="false"/> diff --git a/applications/accounting/servicedef/services_invoice.xml b/applications/accounting/servicedef/services_invoice.xml index 776e095c0f..4843691a02 100644 --- a/applications/accounting/servicedef/services_invoice.xml +++ b/applications/accounting/servicedef/services_invoice.xml @@ -26,7 +26,7 @@ under the License. <service name="getNextInvoiceId" engine="groovy" - location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServices.groovy" invoke="getNextInvoiceId"> + location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServicesScript.groovy" invoke="getNextInvoiceId"> <description>Get the Next Invoice ID According to Settings on the PartyAcctgPreference Entity for the given Party</description> <implements service="createInvoice"/> <attribute name="partyId" type="String" mode="IN" optional="false"/> @@ -34,14 +34,14 @@ under the License. </service> <service name="invoiceSequenceEnforced" engine="groovy" - location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServices.groovy" invoke="invoiceSequenceEnforced"> + location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServicesScript.groovy" invoke="invoiceSequenceEnforced"> <implements service="getNextInvoiceId"/> <attribute name="partyAcctgPreference" type="org.apache.ofbiz.entity.GenericValue" mode="IN"/> <override name="invoiceId" type="Long" mode="OUT"/> </service> <service name="invoiceSequenceRestart" engine="groovy" - location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServices.groovy" invoke="invoiceSequenceRestart"> + location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServicesScript.groovy" invoke="invoiceSequenceRestart"> <implements service="getNextInvoiceId"/> <attribute name="partyAcctgPreference" type="org.apache.ofbiz.entity.GenericValue" mode="IN"/> </service> diff --git a/applications/accounting/servicedef/services_ledger.xml b/applications/accounting/servicedef/services_ledger.xml index 2464a4bb95..d62d10dc09 100644 --- a/applications/accounting/servicedef/services_ledger.xml +++ b/applications/accounting/servicedef/services_ledger.xml @@ -194,7 +194,7 @@ under the License. </service> <!-- AcctgTrans services --> <service name="createAcctgTrans" default-entity-name="AcctgTrans" engine="groovy" auth="true" - location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.groovy" invoke="createAcctgTrans" > + location="component://accounting/src/main/groovy/org/apache/ofbiz/accounting/ledger/GeneralLedgerServicesScript.groovy" invoke="createAcctgTrans" > <description>Create a AcctgTrans record with isPosted set to "N"</description> <permission-service service-name="acctgTransactionPermissionCheck" main-action="CREATE"/> <implements service="interfaceAcctgTrans"/> diff --git a/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/agreement/AgreementServices.groovy b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/agreement/AgreementServicesScript.groovy similarity index 100% rename from applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/agreement/AgreementServices.groovy rename to applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/agreement/AgreementServicesScript.groovy diff --git a/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServices.groovy b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServicesScript.groovy similarity index 100% rename from applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServices.groovy rename to applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/InvoiceServicesScript.groovy diff --git a/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.groovy b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/ledger/GeneralLedgerServicesScript.groovy similarity index 100% rename from applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.groovy rename to applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/ledger/GeneralLedgerServicesScript.groovy diff --git a/applications/content/servicedef/services.xml b/applications/content/servicedef/services.xml index 14b790a2be..6da7fe7cd7 100644 --- a/applications/content/servicedef/services.xml +++ b/applications/content/servicedef/services.xml @@ -41,7 +41,7 @@ </service> <service name="getContentAndDataResource" engine="groovy" default-entity-name="Content" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="getContentAndDataResource"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="getContentAndDataResource"> <description>Get Content and resource information</description> <permission-service service-name="genericContentPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -49,7 +49,7 @@ </service> <service name="getDataResource" engine="groovy" default-entity-name="DataResource" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="getDataResource"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="getDataResource"> <description>Get Content and resource information</description> <permission-service service-name="genericContentPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -117,7 +117,7 @@ </service> <!-- Generic Content Services --> - <service name="createEmailContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createEmailContent"> + <service name="createEmailContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createEmailContent"> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes mode="IN" entity-name="Content" optional="true"/> <attribute name="subject" type="String" mode="IN" optional="false"> @@ -133,7 +133,7 @@ <attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/> <override name="contentId" mode="INOUT"/> </service> - <service name="updateEmailContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="updateEmailContent"> + <service name="updateEmailContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="updateEmailContent"> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <attribute name="subjectDataResourceId" type="String" mode="IN" optional="true"/> <attribute name="subject" type="String" mode="IN" optional="true"/> @@ -143,7 +143,7 @@ <attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/> </service> - <service name="createDownloadContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createDownloadContent"> + <service name="createDownloadContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createDownloadContent"> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes mode="IN" entity-name="Content" optional="true"/> <attribute name="file" type="String" mode="IN" optional="false"> @@ -153,13 +153,13 @@ </attribute> <override name="contentId" mode="INOUT"/> </service> - <service name="updateDownloadContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="updateDownloadContent"> + <service name="updateDownloadContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="updateDownloadContent"> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <attribute name="fileDataResourceId" type="String" mode="IN" optional="true"/> <attribute name="file" type="String" mode="IN" optional="true"/> </service> - <service name="createSimpleTextContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createSimpleTextContent"> + <service name="createSimpleTextContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createSimpleTextContent"> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes mode="IN" entity-name="Content" optional="true"/> <attribute name="text" type="String" mode="IN" optional="false" allow-html="safe"> @@ -169,14 +169,14 @@ </attribute> <override name="contentId" mode="INOUT"/> </service> - <service name="updateSimpleTextContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="updateSimpleTextContent"> + <service name="updateSimpleTextContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="updateSimpleTextContent"> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <attribute name="textDataResourceId" type="String" mode="IN" optional="true"/> <attribute name="text" type="String" mode="IN" optional="true" allow-html="safe"/> </service> <!-- Util --> - <service name="findAssocContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="findAssocContent" auth="true"> + <service name="findAssocContent" engine="groovy" location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="findAssocContent" auth="true"> <attribute name="contentId" mode="IN" type="String" optional="false"/> <attribute name="mapKeys" mode="IN" type="List" optional="false"/> <attribute name="contentAssocs" mode="OUT" type="List" optional="true"/> @@ -412,7 +412,7 @@ </service> <service name="createArticleContent" engine="groovy" transaction-timeout="300" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createArticleContent"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createArticleContent"> <description>Creates content records for a blog entry</description> <required-permissions join-type="AND"> <check-permission permission="CONTENTMGR" action="_CREATE"/> @@ -952,7 +952,7 @@ </service> <service name="createContentAlternativeUrl" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createContentAlternativeUrl" auth="true" transaction-timeout="7200"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createContentAlternativeUrl" auth="true" transaction-timeout="7200"> <description>Create Content Alternative URL</description> <attribute name="contentId" mode="IN" type="String" optional="true"></attribute> <attribute name="contentCreated" mode="OUT" type="String" optional="true"></attribute> diff --git a/applications/content/servicedef/services_commevent.xml b/applications/content/servicedef/services_commevent.xml index 6bde99bc2d..b4fd5e1375 100644 --- a/applications/content/servicedef/services_commevent.xml +++ b/applications/content/servicedef/services_commevent.xml @@ -36,7 +36,7 @@ under the License. The fromData should be defaulted if not passed in. --> <service name="createCommContentDataResource" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createCommContentDataResource"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createCommContentDataResource"> <description>Create CommunicationEvent and Content</description> <implements service="persistContentAndAssoc"/> <attribute name="communicationEventId" type="String" mode="IN" optional="false"> @@ -53,7 +53,7 @@ under the License. </service> <service name="updateCommContentDataResource" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="updateCommContentDataResource" auth="true"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="updateCommContentDataResource" auth="true"> <description>Update CommunicationEvent and Content</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <implements service="persistContentAndAssoc"/> diff --git a/applications/content/servicedef/services_content.xml b/applications/content/servicedef/services_content.xml index 1f6e2ab260..08e1420720 100644 --- a/applications/content/servicedef/services_content.xml +++ b/applications/content/servicedef/services_content.xml @@ -50,7 +50,7 @@ </service> <service name="createTextAndUploadedContent" engine="groovy" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createTextAndUploadedContent"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createTextAndUploadedContent"> <description>Creates text content and optional uploaded sub-content</description> <implements service="createTextContent"/> <implements service="uploadFileInterface" optional="true"/> @@ -67,7 +67,7 @@ </service> <service name="createContentFromDataResource" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createContentFromDataResource"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createContentFromDataResource"> <description>Creates content record from data resource and allows all content fields to be set</description> <!-- uses createContent internally; additonal permission(s) not necessary --> <implements service="createContent" optional="true"/> @@ -81,7 +81,7 @@ </service> <service name="attachUploadToDataResource" engine="groovy" transaction-timeout="300" - location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServices.groovy" invoke="attachUploadToDataResource"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy" invoke="attachUploadToDataResource"> <description>Accepts uploaded content and attaches to an existing data resource</description> <!-- uses createContent internally; additonal permission(s) not necessary --> <implements service="uploadFileInterface"/> @@ -117,7 +117,7 @@ </service> <service name="copyContentAndElectronicTextandAssoc" default-entity-name="Content" engine="groovy" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="copyContentAndElectronicTextandAssoc"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="copyContentAndElectronicTextandAssoc"> <description>Copy a Content, e;ectronic text and assocs</description> <!-- uses createContent internally; additonal permission(s) not necessary --> <auto-attributes include="pk" mode="INOUT" optional="false"/> @@ -162,7 +162,7 @@ </service> <service name="removeContentAndRelated" default-entity-name="Content" engine="groovy" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="removeContentAndRelated"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="removeContentAndRelated"> <description>Remove Content</description> <permission-service service-name="genericContentPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -246,7 +246,7 @@ </service> <service name="assocContent" engine="groovy" default-entity-name="ContentAssoc" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="assocContent"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="assocContent"> <description>Check for permission to perform operation on Content</description> <deprecated use-instead="genericContentPermission" since="Release 22.01"/> <attribute mode="IN" name="targetOperationList" optional="true" type="List"/> @@ -293,7 +293,7 @@ <!-- content status services --> <service name="setContentStatus" engine="groovy" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="setContentStatus"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="setContentStatus"> <description>Set the Content Status</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <attribute name="contentId" type="String" mode="IN" optional="false"> @@ -324,7 +324,7 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deactivateAllContentRoles" engine="groovy" default-entity-name="ContentRole" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="deactivateAllContentRoles"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="deactivateAllContentRoles"> <description>Deactivate all ContentRoles</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <attribute mode="IN" name="contentId" optional="false" type="String"> @@ -351,7 +351,7 @@ <!-- Alternative URLs services --> <service name="createMissingContentAltUrls" engine="groovy" auth="true" use-transaction="false" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="createMissingContentAltUrls"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="createMissingContentAltUrls"> <description>Create missing Content Alternative URLs</description> <attribute name="prodCatalogId" mode="IN" type="String" optional="true"/> <attribute name="webSiteId" mode="IN" type="String" optional="true"/> @@ -417,7 +417,7 @@ <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="updateSingleContentPurpose" engine="groovy" default-entity-name="ContentPurpose" auth="true" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="updateSingleContentPurpose"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="updateSingleContentPurpose"> <description>Removes content purposes and creates a new one</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -482,7 +482,7 @@ <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="deleteContentKeywords" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="deleteContentKeywords" auth="true"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="deleteContentKeywords" auth="true"> <description>Delete all the keywords of a content</description> <permission-service service-name="genericContentPermission" main-action="DELETE"/> <attribute name="contentId" type="String" mode="IN" optional="false"> @@ -492,7 +492,7 @@ </attribute> </service> <service name="indexContentKeywords" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="indexContentKeywords" auth="false"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="indexContentKeywords" auth="false"> <description>Index the Keywords for a Content</description> <attribute name="contentId" type="String" mode="IN" optional="false"> <type-validate> @@ -502,7 +502,7 @@ <attribute name="contentInstance" type="org.apache.ofbiz.entity.GenericValue" mode="IN" optional="true"/> </service> <service name="forceIndexContentKeywords" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy" invoke="forceIndexContentKeywords" auth="true"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy" invoke="forceIndexContentKeywords" auth="true"> <description>Induce all the keywords of a content, ignoring the flag in the Content.</description> <permission-service service-name="genericContentPermission" main-action="CREATE"/> <attribute name="contentId" type="String" mode="IN" optional="false"> diff --git a/applications/content/servicedef/services_data.xml b/applications/content/servicedef/services_data.xml index 2dfd973aed..c02b4a2123 100644 --- a/applications/content/servicedef/services_data.xml +++ b/applications/content/servicedef/services_data.xml @@ -24,7 +24,7 @@ <!-- DataResource services --> <service name="createDataResource" default-entity-name="DataResource" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServices.groovy" invoke="createDataResource" auth="true"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy" invoke="createDataResource" auth="true"> <description>Create a DataResource</description> <permission-service service-name="genericDataResourcePermission" main-action="CREATE"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -41,7 +41,7 @@ <override name="dataResourceName" allow-html="safe"/> </service> <service name="createDataResourceAndAssocToContent" default-entity-name="DataResource" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServices.groovy" invoke="createDataResourceAndAssocToContent" auth="true"> + location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy" invoke="createDataResourceAndAssocToContent" auth="true"> <description>Create a DataResource and link this data to the content present</description> <permission-service service-name="genericDataResourcePermission" main-action="CREATE"/> <implements service="createDataResource" optional="true"/> @@ -148,7 +148,7 @@ <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="getElectronicText" engine="groovy" - location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServices.groovy" invoke="getElectronicText" default-entity-name="ElectronicText" auth="false" > + location="component://content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy" invoke="getElectronicText" default-entity-name="ElectronicText" auth="false" > <description>Get a ElectronicText: Can pass either content value object or contentId</description> <attribute mode="IN" name="contentId" optional="true" type="String"/> <attribute mode="IN" name="content" optional="true" type="org.apache.ofbiz.entity.GenericValue"/> diff --git a/applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy b/applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy similarity index 100% rename from applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServices.groovy rename to applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy diff --git a/applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServices.groovy b/applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy similarity index 100% rename from applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServices.groovy rename to applications/content/src/main/groovy/org/apache/ofbiz/content/data/DataServicesScript.groovy diff --git a/applications/manufacturing/servicedef/services_production_run.xml b/applications/manufacturing/servicedef/services_production_run.xml index 6578a8e004..75bddfc14a 100644 --- a/applications/manufacturing/servicedef/services_production_run.xml +++ b/applications/manufacturing/servicedef/services_production_run.xml @@ -39,7 +39,7 @@ under the License. <attribute name="estimatedCompletionDate" type="java.sql.Timestamp" mode="OUT" optional="true"/> </service> <service name="createProductionRunPartyAssign" engine="groovy" - location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.groovy" invoke="createProductionRunPartyAssign" auth="false"> + location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy" invoke="createProductionRunPartyAssign" auth="false"> <description> Associate a party to the production run </description> @@ -51,7 +51,7 @@ under the License. <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> </service> <service name="createProductionRunAssoc" engine="groovy" - location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.groovy" invoke="createProductionRunAssoc" auth="false"> + location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy" invoke="createProductionRunAssoc" auth="false"> <description> Associate the production run to another production run </description> @@ -194,7 +194,7 @@ under the License. <attribute name="productId" type="String" mode="IN" optional="false"/> </service> <service name="issueProductionRunTask" engine="groovy" - location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.groovy" invoke="issueProductionRunTask" auth="false"> + location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy" invoke="issueProductionRunTask" auth="false"> <description> Issues the Inventory for a Production Run Task. Note that this skips the normal inventory reservation process. @@ -205,7 +205,7 @@ under the License. <attribute name="failIfItemsAreNotOnHand" type="String" mode="IN" optional="true"/> </service> <service name="issueProductionRunTaskComponent" engine="groovy" - location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.groovy" invoke="issueProductionRunTaskComponent" auth="false"> + location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy" invoke="issueProductionRunTaskComponent" auth="false"> <description> Issues the Inventory for a Production Run Task Component. For more info see the issueProductionRunTask service. If fromDate is passed, then the WorkEffortGoodStandard record with pk composed of (workEffortId|productId|fromDate) @@ -232,7 +232,7 @@ under the License. <attribute name="description" type="String" mode="IN" optional="true"/> </service> <service name="issueInventoryItemToWorkEffort" engine="groovy" - location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.groovy" invoke="issueInventoryItemToWorkEffort" auth="false"> + location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy" invoke="issueInventoryItemToWorkEffort" auth="false"> <description> Issue one InventoryItem (or part of it) to a WorkEffort. Note that this skips the normal inventory reservation process. diff --git a/applications/manufacturing/servicedef/services_routing.xml b/applications/manufacturing/servicedef/services_routing.xml index 6fe0e834e2..ef4d4f5629 100644 --- a/applications/manufacturing/servicedef/services_routing.xml +++ b/applications/manufacturing/servicedef/services_routing.xml @@ -42,7 +42,7 @@ under the License. <attribute name="sequenceNumNotOk" type="String" mode="OUT" optional="false"/> </service> <service name="getProductRouting" engine="groovy" auth="true" - location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServices.groovy" invoke="getProductRouting"> + location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServicesScript.groovy" invoke="getProductRouting"> <description>Get the product's routing and routing tasks</description> <attribute mode="IN" name="productId" optional="false" type="String"/> <attribute mode="IN" name="workEffortId" optional="true" type="String"/> @@ -52,7 +52,7 @@ under the License. <attribute mode="OUT" name="tasks" type="java.util.List" optional="true"/> </service> <service name="getRoutingTaskAssocs" engine="groovy" auth="true" - location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServices.groovy" invoke="getRoutingTaskAssocs"> + location="component://manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServicesScript.groovy" invoke="getRoutingTaskAssocs"> <description>Get the routing task assocs of a given routing</description> <attribute mode="IN" name="workEffortId" optional="false" type="String"/> <attribute mode="OUT" name="routingTaskAssocs" type="java.util.List" optional="true"/> diff --git a/applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.groovy b/applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy similarity index 100% rename from applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.groovy rename to applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy diff --git a/applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServices.groovy b/applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServicesScript.groovy similarity index 100% rename from applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServices.groovy rename to applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/routing/RoutingServicesScript.groovy diff --git a/applications/order/servicedef/services.xml b/applications/order/servicedef/services.xml index 7343f1bb33..74b9ed49c2 100644 --- a/applications/order/servicedef/services.xml +++ b/applications/order/servicedef/services.xml @@ -663,7 +663,7 @@ under the License. </service> <!-- Order View Services --> <service name="getOrderedSummaryInformation" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderServices.groovy" invoke="getOrderedSummaryInformation"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderServicesScript.groovy" invoke="getOrderedSummaryInformation"> <description>Get Ordered Summary Information</description> <attribute name="partyId" type="String" mode="IN" optional="false"> <type-validate> @@ -851,7 +851,7 @@ under the License. </service> <service name="getNextOrderId" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderServices.groovy" invoke="getNextOrderId"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderServicesScript.groovy" invoke="getNextOrderId"> <description>Get the Next Order ID According to Settings on the PartyAcctgPreference Entity for the given Party</description> <implements service="storeOrder" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="false"> diff --git a/applications/order/servicedef/services_quote.xml b/applications/order/servicedef/services_quote.xml index d9493651ff..eb893431bb 100644 --- a/applications/order/servicedef/services_quote.xml +++ b/applications/order/servicedef/services_quote.xml @@ -26,7 +26,7 @@ under the License. <!-- Quote --> <service name="getNextQuoteId" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="getNextQuoteId"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="getNextQuoteId"> <description>Get the Next Quote ID According to Settings on the PartyAcctgPreference Entity for the given Party</description> <implements service="createQuote"/> <attribute name="partyId" type="String" mode="IN"/> @@ -34,26 +34,26 @@ under the License. </service> <service name="quoteSequenceEnforced" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="quoteSequenceEnforced"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="quoteSequenceEnforced"> <implements service="getNextQuoteId" optional="true"/> <attribute name="partyAcctgPreference" type="org.apache.ofbiz.entity.GenericValue" mode="IN"/> <override name="quoteId" type="Long" mode="OUT"/> </service> <service name="createQuote" default-entity-name="Quote" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuote" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuote" auth="true"> <description>Create an Quote</description> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes include="pk" mode="OUT" optional="true"/> </service> <service name="updateQuote" default-entity-name="Quote" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="updateQuote" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="updateQuote" auth="true"> <description>Update a Quote</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="copyQuote" default-entity-name="Quote" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="copyQuote" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="copyQuote" auth="true"> <description>Copy a Quote</description> <auto-attributes include="pk" mode="INOUT" optional="false"/> <attribute name="copyQuoteRoles" type="String" mode="IN" optional="true"/> @@ -64,7 +64,7 @@ under the License. <attribute name="copyQuoteTerms" type="String" mode="IN" optional="true"/> </service> <service name="checkUpdateQuoteStatus" default-entity-name="Quote" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="checkUpdateQuoteStatus" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="checkUpdateQuoteStatus" auth="true"> <description>Set the Quote status to ordered.</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -104,25 +104,25 @@ under the License. </service> <!-- QuoteItem --> <service name="createQuoteItem" default-entity-name="QuoteItem" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuoteItem" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuoteItem" auth="true"> <description>Create a QuoteItem</description> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateQuoteItem" default-entity-name="QuoteItem" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="updateQuoteItem" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="updateQuoteItem" auth="true"> <description>Update a QuoteItem</description> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeQuoteItem" default-entity-name="QuoteItem" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="removeQuoteItem" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="removeQuoteItem" auth="true"> <description>Remove a QuoteItem</description> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="copyQuoteItem" default-entity-name="QuoteItem" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="copyQuoteItem" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="copyQuoteItem" auth="true"> <description>Copy a QuoteItem</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -204,26 +204,26 @@ under the License. </service> <!-- Specialized Quote services --> <service name="createQuoteAndQuoteItemForRequest" engine="groovy" default-entity-name="QuoteItem" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuoteAndQuoteItemForRequest" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuoteAndQuoteItemForRequest" auth="true"> <description>Create a new Quote and Quote Item for a CustRequest</description> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes include="pk" mode="OUT" optional="true"/> <override name="custRequestId" optional="false"/> </service> <service name="autoUpdateQuotePrice" engine="groovy" default-entity-name="QuoteItem" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="autoUpdateQuotePrice" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="autoUpdateQuotePrice" auth="true"> <description>Update the QuoteItem price with the passed value (if present) or automatically from the averageCost</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="manualQuoteUnitPrice" type="BigDecimal" mode="IN" optional="true"/> <attribute name="defaultQuoteUnitPrice" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="autoCreateQuoteAdjustments" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="autoCreateQuoteAdjustments"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="autoCreateQuoteAdjustments"> <description>Remove all existing quote adjustments, recalc them and persist in QuoteAdjustment.</description> <attribute name="quoteId" type="String" mode="IN" optional="false"/> </service> <service name="createQuoteAdjustment" default-entity-name="QuoteAdjustment" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuoteAdjustment"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuoteAdjustment"> <description>Creates a new quote adjustment record</description> <auto-attributes mode="IN" include="nonpk" optional="true"/> <auto-attributes mode="OUT" include="pk" optional="false"/> @@ -269,7 +269,7 @@ under the License. <auto-attributes mode="IN" include="pk"/> </service> <service name="ensureWorkEffortAndCreateQuoteWorkEffort" default-entity-name="WorkEffort" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="ensureWorkEffortAndCreateQuoteWorkEffort" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="ensureWorkEffortAndCreateQuoteWorkEffort" auth="true"> <description>Creates a new QuoteWorkEffort record and WorkEffort if needed</description> <required-permissions join-type="AND"> <check-permission permission="ORDERMGR" action="_CREATE"/> @@ -280,21 +280,21 @@ under the License. <attribute name="quoteId" type="String" mode="IN"/> </service> <service name="createQuoteFromCart" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuoteFromCart"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuoteFromCart"> <description>Creates a new quote from a shopping cart</description> <attribute name="cart" type="org.apache.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> <attribute name="applyStorePromotions" type="String" mode="IN" optional="true"/> <attribute name="quoteId" type="String" mode="OUT" optional="false"/> </service> <service name="createQuoteFromShoppingList" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuoteFromShoppingList"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuoteFromShoppingList"> <description>Creates a new quote from a shopping list</description> <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> <attribute name="applyStorePromotions" type="String" mode="IN" optional="true"/> <attribute name="quoteId" type="String" mode="OUT" optional="false"/> </service> <service name="createQuoteFromCustRequest" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuoteFromCustRequest"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuoteFromCustRequest"> <description>Creates a new quote from a customer request</description> <attribute name="custRequestId" type="String" mode="IN" optional="false"/> <attribute name="quoteTypeId" type="String" mode="IN" optional="true"/> @@ -328,7 +328,7 @@ under the License. <attribute name="quoteId" type="String" mode="OUT" optional="false"/> </service> <service name="createQuoteNote" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy" invoke="createQuoteNote" auth="true"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy" invoke="createQuoteNote" auth="true"> <description>Create a note item and associate with a quote</description> <attribute name="quoteId" type="String" mode="IN"/> <attribute name="noteInfo" type="String" mode="IN" allow-html="safe"> diff --git a/applications/order/servicedef/services_requirement.xml b/applications/order/servicedef/services_requirement.xml index b8c85fe0c6..07ddbed252 100644 --- a/applications/order/servicedef/services_requirement.xml +++ b/applications/order/servicedef/services_requirement.xml @@ -43,7 +43,7 @@ under the License. <auto-attributes mode="IN" include="pk" optional="false"/> </service> <service name="deleteRequirementAndRelated" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServices.groovy" invoke="deleteRequirementAndRelated"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServicesScript.groovy" invoke="deleteRequirementAndRelated"> <description>Delete a requirement after deleting related entity records.</description> <attribute name="requirementId" type="String" mode="IN" optional="false"/> </service> @@ -111,7 +111,7 @@ under the License. <auto-attributes entity-name="OrderRequirementCommitment" include="nonpk" mode="IN" optional="true"/> </service> <service name="checkCreateOrderRequirement" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderRequirementServices.groovy" invoke="checkCreateOrderRequirement"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderRequirementServicesScript.groovy" invoke="checkCreateOrderRequirement"> <description>Create OrderRequirementCommitment and Requirement for items with automatic requirement upon ordering</description> <required-permissions join-type="AND"> <check-permission permission="ORDERMGR" action="_CREATE"/> @@ -158,13 +158,13 @@ under the License. </service> <service name="autoAssignRequirementToSupplier" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServices.groovy" invoke="autoAssignRequirementToSupplier"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServicesScript.groovy" invoke="autoAssignRequirementToSupplier"> <description>If the requirement is a product requirement (purchasing) try to assign it to the primary supplier</description> <attribute name="requirementId" type="String" mode="IN" optional="false"/> </service> <service name="createTransferFromRequirement" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServices.groovy" invoke="createTransferFromRequirement"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServicesScript.groovy" invoke="createTransferFromRequirement"> <description>Create the inventory transfers required to fulfill the requirement.</description> <required-permissions join-type="AND"> <check-permission permission="ORDERMGR" action="_CREATE"/> diff --git a/applications/order/servicedef/services_return.xml b/applications/order/servicedef/services_return.xml index 6e50ee2137..2194a581ca 100644 --- a/applications/order/servicedef/services_return.xml +++ b/applications/order/servicedef/services_return.xml @@ -25,7 +25,7 @@ under the License. <!-- Order Return Services --> <service name="quickReturnOrder" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="quickReturnFromOrder"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="quickReturnFromOrder"> <description>Quick Return Order</description> <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="returnReasonId" type="String" mode="IN" optional="true"/> @@ -35,14 +35,14 @@ under the License. <attribute name="returnId" type="String" mode="OUT" optional="false"/> </service> <service name="createReturnHeader" default-entity-name="ReturnHeader" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="createReturnHeader"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="createReturnHeader"> <description>Create a new ReturnHeader</description> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="returnHeaderTypeId" optional="false"/> </service> <service name="updateReturnHeader" default-entity-name="ReturnHeader" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="updateReturnHeader"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="updateReturnHeader"> <description>Update a ReturnHeader</description> <permission-service service-name="returnPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -56,7 +56,7 @@ under the License. </service> <service name="createReturnItem" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="createReturnItem"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="createReturnItem"> <description>Create a new ReturnItem in the RETURN_REQUESTED status, based on returnableQuantity and returnablePrice from the getReturnableQuantity service. This can be called by the customer to request a return for himself or by a user with ORDERMGR_CREATE, but, if the former, the returnPrice will be overriden by the returnablePrice from getReturnableQuantity.</description> @@ -72,7 +72,7 @@ under the License. <override name="returnQuantity" optional="false"/> </service> <service name="updateReturnItem" engine="groovy" default-entity-name="ReturnItem" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="updateReturnItem"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="updateReturnItem"> <description>Update a ReturnItem and related adjustments</description> <permission-service service-name="returnPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -80,14 +80,14 @@ under the License. <attribute name="oldStatusId" type="String" mode="OUT" optional="false"/> </service> <service name="updateReturnItemsStatus" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="updateReturnItemsStatus"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="updateReturnItemsStatus"> <description>Update ReturnItem(s) Status</description> <permission-service service-name="returnPermissionCheck" main-action="UPDATE"/> <attribute name="returnId" type="String" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="false"/> </service> <service name="removeReturnItem" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="removeReturnItem"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="removeReturnItem"> <description>Remove a ReturnItem and related adjustments</description> <permission-service service-name="returnPermissionCheck" main-action="DELETE"/> <auto-attributes entity-name="ReturnItem" include="pk" mode="IN" optional="false"/> @@ -104,14 +104,14 @@ under the License. <attribute name="returnItemResponseId" type="String" mode="IN" optional="false"/> </service> <service name="cancelReturnItems" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="cancelReturnItems"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="cancelReturnItems"> <description>Cancel ReturnItems and set their status to "RETURN_CANCELLED"</description> <permission-service service-name="returnPermissionCheck" main-action="UPDATE"/> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> <service name="cancelReplacementOrderItems" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="cancelReplacementOrderItems"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="cancelReplacementOrderItems"> <description>Cancel the associated OrderItems of the replacement order, if any.</description> <permission-service service-name="returnPermissionCheck" main-action="UPDATE"/> <auto-attributes entity-name="ReturnItem" include="pk" mode="IN" optional="false"/> @@ -142,7 +142,7 @@ under the License. <permission-service service-name="returnPermissionCheck" main-action="DELETE"/> <auto-attributes entity-name="ReturnAdjustment" include="pk" mode="IN" optional="false"/> </service> - <service name="createReturnAndItemOrAdjustment" engine="groovy" location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" + <service name="createReturnAndItemOrAdjustment" engine="groovy" location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="createReturnAndItemOrAdjustment"> <description>If returnId is null, create a return; then create Return Item or Adjustment based on the parameters passed in</description> <auto-attributes mode="IN" include="nonpk" entity-name="ReturnHeader" optional="true"/> @@ -239,37 +239,37 @@ under the License. <attribute name="returnTypeId" type="String" mode="IN" optional="false"/> </service> <service name="processWaitReplacementReturn" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="processWaitReplacementReservedReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="processWaitReplacementReservedReturn"> <description>Process the replacements in a wait return</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> <service name="processWaitReplacementReservedReturn" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="processWaitReplacementReservedReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="processWaitReplacementReservedReturn"> <description>Process the replacements in a wait reserved return when the return is accepted and then received</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> <service name="processCrossShipReplacementReturn" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="processCrossShipReplacementReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="processCrossShipReplacementReturn"> <description>Process the replacements in a cross-ship return</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> <service name="processRepairReplacementReturn" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="processRepairReplacementReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="processRepairReplacementReturn"> <description>Process the replacements in a repair return</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> <service name="processReplaceImmediatelyReturn" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="processReplaceImmediatelyReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="processReplaceImmediatelyReturn"> <description>Process the replacements in a Immediate Return</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> <service name="processRefundOnlyReturn" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="processRefundOnlyReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="processRefundOnlyReturn"> <description>Process the Refund in a return</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> <service name="processRefundImmediatelyReturn" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="processRefundImmediatelyReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="processRefundImmediatelyReturn"> <description>Process the Immediate Refund in a return</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> </service> @@ -286,7 +286,7 @@ under the License. <!-- other return services --> <service name="updateReturnStatusFromReceipt" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="updateReturnStatusFromReceipt"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="updateReturnStatusFromReceipt"> <description>Update return/item status when items have been received</description> <permission-service service-name="returnPermissionCheck" main-action="UPDATE"/> <attribute name="returnId" type="String" mode="IN" optional="false"/> @@ -332,27 +332,27 @@ under the License. </service> <service name="getStatusItemsForReturn" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="getStatusItemsForReturn"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="getStatusItemsForReturn"> <description>Get the return status associated with customer/vendor return</description> <attribute name="returnHeaderTypeId" type="String" mode="IN" optional="false"/> <attribute name="statusItems" type="List" mode="OUT" optional="false"/> </service> <service name="createExchangeOrderAssoc" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="createExchangeOrderAssoc"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="createExchangeOrderAssoc"> <description>Associate exchange order with original order in OrderItemAssoc entity</description> <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="originOrderId" type="String" mode="IN" optional="false"/> </service> <service name="addProductsBackToCategory" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="addProductsBackToCategory"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="addProductsBackToCategory"> <description>Add product(s) back to category if it has no active category</description> <attribute name="returnId" type="String" mode="IN" optional="true"/> <attribute name="inventoryItemId" type="String" mode="IN" optional="true"/> </service> <service name="createReturnStatus" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="createReturnStatus"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="createReturnStatus"> <description>Create Return Status</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> <attribute name="returnItemSeqId" type="String" mode="IN" optional="true"/> @@ -365,7 +365,7 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateReturnContactMech" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="updateReturnContactMech" auth="true" default-entity-name="ReturnContactMech"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="updateReturnContactMech" auth="true" default-entity-name="ReturnContactMech"> <description>Update Return Contact Mech</description> <permission-service service-name="returnPermissionCheck" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -378,7 +378,7 @@ under the License. <!-- Item Return Service --> <service name="createReturnItemForRental" engine="groovy" - location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy" invoke="createReturnItemForRental"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy" invoke="createReturnItemForRental"> <description>Create the return item for rental (which items has product type is ASSET_USAGE_OUT_IN)</description> <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="returnId" type="String" mode="OUT" optional="false"/> diff --git a/applications/order/servicedef/services_shoppinglist.xml b/applications/order/servicedef/services_shoppinglist.xml index e06b971c15..947ee8f707 100644 --- a/applications/order/servicedef/services_shoppinglist.xml +++ b/applications/order/servicedef/services_shoppinglist.xml @@ -31,7 +31,7 @@ under the License. <attribute name="shippingMethodString" type="String" mode="IN" optional="true"/> </service> <service name="createShoppingList" engine="groovy" auth="false" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="createShoppingList"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="createShoppingList"> <description>Create a shopping list entity</description> <permission-service service-name="checkShoppingListSecurity" main-action="CREATE"/> <implements service="createShoppingListRecurrence"/> @@ -39,7 +39,7 @@ under the License. <attribute name="shoppingListId" type="String" mode="OUT" optional="false"/> </service> <service name="updateShoppingList" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="updateShoppingList"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="updateShoppingList"> <description>Update a shopping list entity</description> <permission-service service-name="checkShoppingListSecurity" main-action="UPDATE"/> <implements service="createShoppingListRecurrence"/> @@ -52,13 +52,13 @@ under the License. <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> </service> <service name="checkShoppingListSecurity" engine="groovy" auth="false" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="checkShoppingListSecurity"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="checkShoppingListSecurity"> <description>Checks security on a ShoppingList</description> <implements service="permissionInterface"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> </service> <service name="calculateShoppingListDeepTotalPrice" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="calculateShoppingListDeepTotalPrice"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="calculateShoppingListDeepTotalPrice"> <description>Remove a shopping list entity</description> <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> <attribute name="prodCatalogId" type="String" mode="IN" optional="false"/> @@ -117,7 +117,7 @@ under the License. <attribute name="configId" type="String" mode="IN" optional="true"/> </service> <service name="createShoppingListItem" engine="groovy" auth="false" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="createShoppingListItem"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="createShoppingListItem"> <description>Create a shopping list item</description> <permission-service service-name="checkShoppingListItemSecurity" main-action="CREATE"/> <implements service="shoppingListItemInterface"/> @@ -127,33 +127,33 @@ under the License. <attribute name="shoppingListItemSeqId" type="String" mode="OUT" optional="false"/> </service> <service name="updateShoppingListItem" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="updateShoppingListItem"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="updateShoppingListItem"> <description>Update a shopping list item</description> <permission-service service-name="checkShoppingListItemSecurity" main-action="UPDATE"/> <implements service="shoppingListItemInterface"/> <attribute name="shoppingListItemSeqId" type="String" mode="IN" optional="false"/> </service> <service name="removeShoppingListItem" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="removeShoppingListItem"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="removeShoppingListItem"> <description>Remove a shopping list item</description> <permission-service service-name="checkShoppingListItemSecurity" main-action="DELETE"/> <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> <attribute name="shoppingListItemSeqId" type="String" mode="IN" optional="false"/> </service> <service name="checkShoppingListItemSecurity" engine="groovy" auth="false" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="checkShoppingListItemSecurity"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="checkShoppingListItemSecurity"> <description>Checks security on a ShoppingListItem</description> <implements service="permissionInterface"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="shoppingListId" type="String" mode="IN" optional="true"/> </service> <service name="addSuggestionsToShoppingList" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="addSuggestionsToShoppingList"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="addSuggestionsToShoppingList"> <description>Add suggestions to a shopping list</description> <attribute name="orderId" type="String" mode="IN" optional="false"/> </service> <service name="addDistinctShoppingListItem" engine="groovy" auth="true" - location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy" invoke="addDistinctShoppingListItem"> + location="component://order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy" invoke="addDistinctShoppingListItem"> <description>Adds a shopping list item if one with the same productId does not exist</description> <implements service="shoppingListItemInterface"/> <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy similarity index 100% rename from applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServices.groovy rename to applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderReturnServicesScript.groovy diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderServices.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderServicesScript.groovy similarity index 100% rename from applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderServices.groovy rename to applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderServicesScript.groovy diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy similarity index 100% rename from applications/order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServices.groovy rename to applications/order/src/main/groovy/org/apache/ofbiz/order/quote/QuoteServicesScript.groovy diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServices.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServicesScript.groovy similarity index 100% rename from applications/order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServices.groovy rename to applications/order/src/main/groovy/org/apache/ofbiz/order/requirement/RequirementServicesScript.groovy diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy similarity index 100% rename from applications/order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.groovy rename to applications/order/src/main/groovy/org/apache/ofbiz/order/shoppinglist/ShoppingListServicesScript.groovy diff --git a/applications/party/servicedef/services.xml b/applications/party/servicedef/services.xml index 78bea41858..dbc3b163a3 100644 --- a/applications/party/servicedef/services.xml +++ b/applications/party/servicedef/services.xml @@ -26,7 +26,7 @@ under the License. <!-- AddressMatchMap services --> <service name="createAddressMatchMap" engine="groovy" default-entity-name="AddressMatchMap" auth="true" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="createAddressMatchMap"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="createAddressMatchMap"> <description>Create an AddressMatchMap record</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> @@ -46,7 +46,7 @@ under the License. <auto-attributes mode="IN" include="pk" optional="false"/> </service> <service name="clearAddressMatchMap" engine="groovy" default-entity-name="AddressMatchMap" auth="true" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="clearAddressMatchMap"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="clearAddressMatchMap"> <description>Delete an AddressMatchMap record</description> <permission-service service-name="partyBasePermissionCheck" main-action="DELETE"/> </service> @@ -182,7 +182,7 @@ under the License. </service> <service name="savePartyNameChange" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="savePartyNameChange" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="savePartyNameChange" auth="true"> <description>Save Party Name Change</description> <attribute name="partyId" type="String" mode="IN" optional="true"><!-- if empty, will use userLogin.partyId to handle special case for updatePerson, etc --></attribute> <attribute name="groupName" type="String" mode="IN" optional="true"/> @@ -193,7 +193,7 @@ under the License. <attribute name="suffix" type="String" mode="IN" optional="true"/> </service> <service name="getPartyNameForDate" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getPartyNameForDate" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getPartyNameForDate" auth="true"> <description>Get Party Name For Date</description> <attribute name="partyId" type="String" mode="IN" optional="false"> <type-validate> @@ -254,7 +254,7 @@ under the License. </service> <service name="setPartyProfileDefaults" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="setPartyProfileDefaults" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="setPartyProfileDefaults" auth="true"> <description>Sets the party (customer) profile defaults</description> <permission-service service-name="partyIdPermissionCheck" main-action="UPDATE"/> <auto-attributes mode="IN" entity-name="PartyProfileDefault" include="all" optional="true"/> @@ -372,7 +372,7 @@ under the License. <!-- Party Relationship services --> <service name="createPartyRelationship" default-entity-name="PartyRelationship" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="createPartyRelationship" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="createPartyRelationship" auth="true"> <description> Create a Relationship between two Parties; if partyIdFrom is not specified the partyId of the current userLogin will be used; @@ -385,7 +385,7 @@ under the License. <override name="partyIdTo" optional="false"/> </service> <service name="updatePartyRelationship" default-entity-name="PartyRelationship" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="updatePartyRelationship" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="updatePartyRelationship" auth="true"> <description> Update a Relationship between two Parties; if partyIdFrom is not specified the partyId of the current userLogin will be used; @@ -400,7 +400,7 @@ under the License. <override name="roleTypeIdTo" optional="true"/> </service> <service name="deletePartyRelationship" default-entity-name="PartyRelationship" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="deletePartyRelationship" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="deletePartyRelationship" auth="true"> <description> Delete a Relationship between two Parties; if partyIdFrom is not specified the partyId of the current userLogin will be used; @@ -445,7 +445,7 @@ under the License. </service> <service name="createPartyRelationshipContactAccount" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="createPartyRelationshipContactAccount" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="createPartyRelationshipContactAccount" auth="true"> <description>create a company/contact relationship and add the related roles</description> <attribute name="accountPartyId" type="String" mode="IN"/> <attribute name="contactPartyId" type="String" mode="IN"/> @@ -624,7 +624,7 @@ under the License. <attribute name="partyIdTo" type="String" mode="IN" optional="false"/> </service> <service name="createPartyFtpAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="createPartyFtpAddress" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="createPartyFtpAddress" auth="true"> <description>Create an Ftp Address associated to a party</description> <permission-service service-name="partyContactMechPermissionCheck" main-action="CREATE"/> <auto-attributes entity-name="ContactMech" include="nonpk" mode="IN" optional="true"/> @@ -634,7 +634,7 @@ under the License. <attribute name="contactMechId" type="String" mode="INOUT" optional="true"/> </service> <service name="updatePartyFtpAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="updatePartyFtpAddress" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="updatePartyFtpAddress" auth="true"> <description>Update an Ftp Address associated to a party</description> <permission-service service-name="partyContactMechPermissionCheck" main-action="UPDATE"/> <auto-attributes entity-name="PartyContactMech" mode="IN" optional="true"/> @@ -756,7 +756,7 @@ under the License. <auto-attributes mode="IN" include="pk"/> </service> <service name="createPartyIdentifications" engine="groovy" default-entity-name="PartyIdentification" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="createPartyIdentifications"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="createPartyIdentifications"> <description>create many identifications with format in map identifications : [partyType : TYPE, TYPE : value]</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <attribute name="partyId" mode="IN" type="String"/> @@ -792,7 +792,7 @@ under the License. </service> <service name="setCommunicationEventStatus" engine="groovy" default-entity-name="CommunicationEvent" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="setCommunicationEventStatus" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="setCommunicationEventStatus" auth="true"> <description>Set the Communication event Status</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="UPDATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> @@ -803,7 +803,7 @@ under the License. </service> <service name="setCommunicationEventRoleStatus" engine="groovy" default-entity-name="CommunicationEventRole" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="setCommunicationEventRoleStatus" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="setCommunicationEventRoleStatus" auth="true"> <description>Set the Communication event Status for a specific role</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="UPDATE"/> <auto-attributes mode="IN" include="pk" optional="false"/> @@ -826,19 +826,19 @@ under the License. <override name="subject" allow-html="safe"/> </service> <service name="createCommunicationEvent" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="createCommunicationEvent" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="createCommunicationEvent" auth="true"> <description>Create a Communication Event with permission check</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="CREATE"/> <implements service="createCommunicationEventInterface"/> </service> <service name="createCommunicationEventWithoutPermission" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="createCommunicationEventWithoutPermission" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="createCommunicationEventWithoutPermission" auth="false"> <description>Create a Communication Event without permission check</description> <implements service="createCommunicationEventInterface"/> </service> <service name="updateCommunicationEvent" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="updateCommunicationEvent" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="updateCommunicationEvent" auth="true"> <description>Update a Communication Event</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="UPDATE"/> <auto-attributes entity-name="CommunicationEvent" include="pk" mode="IN" optional="false"/> @@ -852,7 +852,7 @@ under the License. <service name="deleteCommunicationEvent" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="deleteCommunicationEvent" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="deleteCommunicationEvent" auth="true"> <description>Delete a Communication Event, optionally delete the attached content and dataresource</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="DELETE"/> <auto-attributes entity-name="CommunicationEvent" include="pk" mode="IN" optional="false"/> @@ -860,7 +860,7 @@ under the License. </service> <service name="deleteCommunicationEventWorkEffort" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="deleteCommunicationEventWorkEffort" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="deleteCommunicationEventWorkEffort" auth="true"> <description>Delete a Communication Event, optionally delete the attached content and dataresource and when this is the only communication event connected to a workeffort delete the workeffort too.</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="DELETE"/> @@ -901,14 +901,14 @@ under the License. </service> <service name="createCommunicationEventRole" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="createCommunicationEventRole" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="createCommunicationEventRole" auth="true"> <description>Create a Communication Event Role with permission check</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="CREATE"/> <implements service="createCommunicationEventRoleInterface"/> </service> <service name="createCommunicationEventRoleWithoutPermission" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="createCommunicationEventRole" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="createCommunicationEventRole" auth="true"> <description>Create a Communication Event Role without permission check</description> <implements service="createCommunicationEventRoleInterface"/> </service> @@ -921,7 +921,7 @@ under the License. </service> <service name="removeCommunicationEventRole" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="removeCommunicationEventRole" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="removeCommunicationEventRole" auth="true"> <description>Remove a Communication Event Role</description> <permission-service service-name="partyCommunicationEventPermissionCheck" main-action="DELETE"/> <auto-attributes entity-name="CommunicationEventRole" include="pk" mode="IN" optional="false"/> @@ -953,7 +953,7 @@ under the License. </service> <service name="setCommEventRoleToRead" engine="groovy" default-entity-name="CommunicationEventRole" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="setCommEventRoleToRead" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="setCommEventRoleToRead" auth="false"> <description>Marks a communication event as read</description> <auto-attributes include="pk" mode="IN" optional="true"/> <override name="communicationEventId" optional="false"/> @@ -1044,7 +1044,7 @@ under the License. </service> <service name="sendEmailDated" engine="groovy" use-transaction="false" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="sendEmailDated" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="sendEmailDated" auth="true"> <description>Checks for email communication events with the status COM_IN_PROGRESS and a startdate which is expired, then send the email</description> </service> @@ -1083,7 +1083,7 @@ under the License. </service> <service name="getPartyEmail" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getPartyEmail" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getPartyEmail" auth="false"> <description>Get the main party Email address</description> <attribute name="partyId" type="String" mode="IN" optional="false"> <type-validate> @@ -1100,7 +1100,7 @@ under the License. </service> <service name="getPartyTelephone" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getPartyTelephone" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getPartyTelephone" auth="false"> <description>Get the party Email Telephone</description> <attribute name="contactMechId" type="String" mode="OUT" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="false"/> @@ -1112,7 +1112,7 @@ under the License. </service> <service name="getPartyPostalAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getPartyPostalAddress" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getPartyPostalAddress" auth="false"> <description>Get the party postal address</description> <attribute name="partyId" type="String" mode="IN" optional="false"> <type-validate> @@ -1146,13 +1146,13 @@ under the License. </service> <service name="sendUpdatePersonalInfoEmailNotification" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="sendUpdatePersonalInfoEmailNotification" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="sendUpdatePersonalInfoEmailNotification" auth="false"> <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="updatedUserLogin" type="org.apache.ofbiz.entity.GenericValue" mode="IN" optional="true"/> <attribute name="productStoreId" type="String" mode="IN" optional="true"/> </service> <service name="sendCreatePartyEmailNotification" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="sendCreatePartyEmailNotification" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="sendCreatePartyEmailNotification" auth="false"> <attribute name="partyId" type="String" mode="IN" optional="false"> <type-validate> <fail-property resource="PartyErrorUiLabels" property="PartyRequiredFieldMissingPartyId"/> @@ -1178,7 +1178,7 @@ under the License. <attribute name="expireDate" type="String" mode="IN" optional="true"/> </service> <service name="sendVerifyEmailAddressNotification" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="sendVerifyEmailAddressNotification"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="sendVerifyEmailAddressNotification"> <attribute name="emailAddress" type="String" mode="IN" optional="false"> <type-validate> <fail-property resource="PartyErrorUiLabels" property="PartyRequiredFieldMissingEmailAddress"/> @@ -1186,7 +1186,7 @@ under the License. </attribute> </service> <service name="verifyEmailAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="verifyEmailAddress"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="verifyEmailAddress"> <attribute name="verifyHash" type="String" mode="IN" optional="false"> <type-validate> <fail-property resource="PartyErrorUiLabels" property="PartyRequiredFieldMissingVerifyHash"/> @@ -1400,7 +1400,7 @@ under the License. <attribute name="phoneContactMechId" type="String" mode="IN" optional="true"/> </service> <service name="createUpdatePerson" engine="groovy" default-entity-name="Person" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="createUpdatePerson" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="createUpdatePerson" auth="false"> <description>Create and Update a person</description> <auto-attributes mode="INOUT" include="pk" optional="true"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> @@ -1468,7 +1468,7 @@ under the License. </service> <service name="quickCreateCustomer" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="quickCreateCustomer"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="quickCreateCustomer"> <description>Create customer profile on basis of First Name ,Last Name and Email Address</description> <attribute name="firstName" type="String" mode="IN" optional="false"> <type-validate> @@ -1495,7 +1495,7 @@ under the License. </service> <service name="getPartyMainRole" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getPartyMainRole"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getPartyMainRole"> <description>Get the main role of this party which is a child of the MAIN_ROLE roletypeId</description> <attribute name="partyId" type="String" mode="IN" optional="false"> <type-validate> @@ -1507,7 +1507,7 @@ under the License. </service> <service name="sendContactUsEmailToCompany" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy" invoke="sendContactUsEmailToCompany" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy" invoke="sendContactUsEmailToCompany" auth="false"> <description>Create communication event and send mail to company</description> <implements service="createCommunicationEventWithoutPermission"/> <attribute name="emailAddress" type="String" mode="IN" optional="true"/> @@ -1526,7 +1526,7 @@ under the License. <!-- send account activated email notification --> <service name="sendAccountActivatedEmailNotification" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="sendAccountActivatedEmailNotification" auth="false"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="sendAccountActivatedEmailNotification" auth="false"> <attribute name="userLoginId" type="String" mode="IN" optional="false"> <type-validate> <fail-property resource="PartyErrorUiLabels" property="PartyRequiredFieldMissingUserLoginId"/> diff --git a/applications/party/servicedef/services_contact.xml b/applications/party/servicedef/services_contact.xml index 97e70f3fd5..97bfd7c1fe 100644 --- a/applications/party/servicedef/services_contact.xml +++ b/applications/party/servicedef/services_contact.xml @@ -32,14 +32,14 @@ under the License. <override name="infoString" optional="true"/> </service> <service name="updateContactMech" default-entity-name="ContactMech" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="updateContactMech" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="updateContactMech" auth="true"> <description>Update a ContactMech</description> <auto-attributes mode="INOUT" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> <service name="createPostalAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="createPostalAddress" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="createPostalAddress" auth="true"> <description>Create a Postal Address</description> <auto-attributes entity-name="PostalAddress" include="all" mode="IN" optional="true"/> <attribute name="contactMechId" type="String" mode="OUT" optional="false"/> @@ -48,7 +48,7 @@ under the License. <override name="postalCode" optional="false"/> </service> <service name="updatePostalAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="updatePostalAddress" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="updatePostalAddress" auth="true"> <description>Update a Postal Address</description> <auto-attributes entity-name="PostalAddress" include="nonpk" mode="IN" optional="true"/> <attribute name="contactMechId" type="String" mode="INOUT" optional="false"/> <!-- the out parameter is the id of the new address --> @@ -63,13 +63,13 @@ under the License. </service> <service name="createTelecomNumber" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="createTelecomNumber" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="createTelecomNumber" auth="true"> <description>Create a Telecommunications Number</description> <auto-attributes entity-name="TelecomNumber" include="all" mode="IN" optional="true"/> <attribute name="contactMechId" type="String" mode="OUT" optional="false"/> </service> <service name="updateTelecomNumber" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="updateTelecomNumber" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="updateTelecomNumber" auth="true"> <description>Update a Telecommunications Number</description> <auto-attributes entity-name="TelecomNumber" include="nonpk" mode="IN" optional="true"/> <attribute name="contactMechId" type="String" mode="INOUT" optional="false"/> @@ -77,7 +77,7 @@ under the License. </service> <service name="createEmailAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="createEmailAddress" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="createEmailAddress" auth="true"> <description>Create an Email Address</description> <auto-attributes entity-name="ContactMech" include="nonpk" mode="IN" optional="true"/> <auto-attributes entity-name="ContactMech" include="pk" mode="OUT" optional="false"/> @@ -85,20 +85,20 @@ under the License. <override name="infoString" optional="true"/> </service> <service name="updateEmailAddress" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy" invoke="updateEmailAddress" auth="true"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy" invoke="updateEmailAddress" auth="true"> <description>Update an Email Address</description> <attribute name="contactMechId" type="String" mode="INOUT" optional="false"/> <attribute name="emailAddress" type="String" mode="IN" optional="false"/> </service> <service name="createFtpAddress" default-entity-name="FtpAddress" engine="groovy" invoke="createFtpAddress" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy"> <description>create FtpAddress</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <auto-attributes mode="OUT" include="pk"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> <service name="updateFtpAddressWithHistory" default-entity-name="FtpAddress" engine="groovy" invoke="updateFtpAddressWithHistory" - location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy"> <description>update FtpAddress</description> <permission-service service-name="partyBasePermissionCheck" main-action="UPDATE"/> <auto-attributes mode="IN" include="pk"/> diff --git a/applications/party/servicedef/services_view.xml b/applications/party/servicedef/services_view.xml index 66998d2e57..1526ae91fe 100644 --- a/applications/party/servicedef/services_view.xml +++ b/applications/party/servicedef/services_view.xml @@ -170,7 +170,7 @@ under the License. </service> <service name="getPartiesByRelationship" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getPartiesByRelationship"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getPartiesByRelationship"> <description>Gets all parties related to partyIdFrom through the PartyRelationship entity</description> <auto-attributes mode="IN" include="all" optional="true" entity-name="PartyRelationship"/> <attribute name="parties" type="java.util.Collection" mode="OUT" optional="true"/> @@ -178,7 +178,7 @@ under the License. </service> <service name="getParentOrganizations" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getParentOrganizations"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getParentOrganizations"> <description> Gets Parent Organizations for an Organization Party. This uses the PartyRelationship table with partyRelationshipTypeId="GROUP_ROLLUP". @@ -201,7 +201,7 @@ under the License. </service> <service name="getChildRoleTypes" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getChildRoleTypes"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getChildRoleTypes"> <description> Get Child RoleTypes. The childRoleTypeIdList coming out will contain the original roleTypeId. @@ -220,7 +220,7 @@ under the License. <!-- PostalAddressBoundary --> <service name="getPostalAddressBoundary" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getPostalAddressBoundary"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getPostalAddressBoundary"> <description>Get all Postal Address Boundaries</description> <permission-service service-name="partyBasePermissionCheck" main-action="VIEW"/> <attribute name="contactMechId" type="String" mode="IN" optional="false"> @@ -232,7 +232,7 @@ under the License. </service> <service name="getRelatedParties" engine="groovy" - location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy" invoke="getRelatedParties"> + location="component://party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy" invoke="getRelatedParties"> <description> Get Parties Related to a Party - The relatedPartyIdList coming out will include the original partyIdFrom diff --git a/applications/party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy b/applications/party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy similarity index 100% rename from applications/party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServices.groovy rename to applications/party/src/main/groovy/org/apache/ofbiz/party/communication/CommunicationEventServicesScript.groovy diff --git a/applications/party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy b/applications/party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy similarity index 100% rename from applications/party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServices.groovy rename to applications/party/src/main/groovy/org/apache/ofbiz/party/contact/ContactMechServicesScript.groovy diff --git a/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy b/applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy similarity index 100% rename from applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServices.groovy rename to applications/party/src/main/groovy/org/apache/ofbiz/party/party/PartyServicesScript.groovy diff --git a/applications/product/servicedef/services.xml b/applications/product/servicedef/services.xml index c07ff50eed..ae6b975b52 100644 --- a/applications/product/servicedef/services.xml +++ b/applications/product/servicedef/services.xml @@ -360,7 +360,7 @@ under the License. <!-- Product content services --> <service name="createProductContent" default-entity-name="ProductContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="createProductContent" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="createProductContent" auth="true"> <description>Add Content To Product</description> <auto-attributes include="pk" mode="INOUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -368,7 +368,7 @@ under the License. <override name="fromDate" default-value="${date:nowTimestamp()}"/> </service> <service name="updateProductContent" default-entity-name="ProductContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="updateProductContent" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="updateProductContent" auth="true"> <description>Update Content To Product</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -379,7 +379,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="createEmailContentForProduct" default-entity-name="ProductContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="createEmailContentForProduct" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="createEmailContentForProduct" auth="true"> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes mode="IN" entity-name="Content" optional="true"/> @@ -396,7 +396,7 @@ under the License. </group> </service> <service name="createDownloadContentForProduct" default-entity-name="ProductContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="createDownloadContentForProduct" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="createDownloadContentForProduct" auth="true"> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" entity-name="Content" optional="true"/> @@ -414,7 +414,7 @@ under the License. </service> <service name="createSimpleTextContentForProduct" default-entity-name="ProductContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="createSimpleTextContentForProduct" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="createSimpleTextContentForProduct" auth="true"> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/> @@ -431,7 +431,7 @@ under the License. </service> <service name="createSimpleTextContentForAlternateLocale" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="createSimpleTextContentForAlternateLocale"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="createSimpleTextContentForAlternateLocale"> <auto-attributes mode="IN" entity-name="Content" optional="true"/> <attribute name="mainContentId" type="String" mode="IN" optional="false"/> <attribute name="text" type="String" mode="IN" optional="false" allow-html="safe"/> @@ -450,7 +450,7 @@ under the License. </service> <service name="uploadProductAdditionalViewImages" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="uploadProductAdditionalViewImages" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="uploadProductAdditionalViewImages" auth="true"> <description>Upload Additional View Images For Product</description> <permission-service service-name="genericContentPermission" main-action="UPDATE"/> <attribute name="productId" type="String" mode="INOUT" optional="false"/> @@ -469,7 +469,7 @@ under the License. </service> <service name="updateContentSEOForProduct" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServices.groovy" invoke="updateContentSEOForProduct" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductContentServicesScript.groovy" invoke="updateContentSEOForProduct" auth="true"> <description>Update Product SEO</description> <attribute name="productId" mode="IN" type="String" optional="false"/> <attribute name="title" mode="IN" type="String" optional="true"/> @@ -907,7 +907,7 @@ under the License. <!-- Category content services --> <service name="createCategoryContent" default-entity-name="ProductCategoryContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="createCategoryContent" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="createCategoryContent" auth="true"> <description>Add Content To Category</description> <auto-attributes include="pk" mode="INOUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -916,7 +916,7 @@ under the License. <!--<override name="contentId" optional="true" mode="INOUT"/>--> </service> <service name="updateCategoryContent" default-entity-name="ProductCategoryContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="updateCategoryContent" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="updateCategoryContent" auth="true"> <description>Update Content To Category</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -928,7 +928,7 @@ under the License. </service> <service name="createSimpleTextContentForCategory" default-entity-name="ProductCategoryContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="createSimpleTextContentForCategory" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="createSimpleTextContentForCategory" auth="true"> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/> @@ -945,7 +945,7 @@ under the License. </service> <service name="updateContentSEOForCategory" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="updateContentSEOForCategory" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="updateContentSEOForCategory" auth="true"> <description>Update SEO Content For Product Category</description> <attribute name="productCategoryId" mode="IN" type="String" optional="false"/> <attribute name="title" mode="IN" type="String" optional="true"/> @@ -954,7 +954,7 @@ under the License. </service> <service name="createRelatedUrlContentForCategory" engine="groovy" default-entity-name="ProductCategoryContent" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="createRelatedUrlContentForCategory" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="createRelatedUrlContentForCategory" auth="true"> <description>Create Related URL Content For Product Category</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -966,7 +966,7 @@ under the License. <override name="fromDate" optional="true"/> </service> <service name="updateRelatedUrlContentForCategory" engine="groovy" default-entity-name="ProductCategoryContent" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="updateRelatedUrlContentForCategory" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="updateRelatedUrlContentForCategory" auth="true"> <description>Update Related URL Content For Product Category</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -979,7 +979,7 @@ under the License. </service> <service name="createDownloadContentForCategory" default-entity-name="ProductCategoryContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="createDownloadContentForCategory" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="createDownloadContentForCategory" auth="true"> <implements service="uploadFileInterface"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -988,7 +988,7 @@ under the License. <override name="prodCatContentTypeId" optional="false"/> </service> <service name="updateDownloadContentForCategory" default-entity-name="ProductCategoryContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServices.groovy" invoke="updateDownloadContentForCategory" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/category/CategoryContentServicesScript.groovy" invoke="updateDownloadContentForCategory" auth="true"> <implements service="uploadFileInterface"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -1133,7 +1133,7 @@ under the License. <!-- Product Config Item content services --> <service name="createProductConfigItemContent" default-entity-name="ProdConfItemContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/config/ProductConfigItemContentServices.groovy" invoke="createProductConfigItemContent" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/config/ProductConfigItemContentServicesScript.groovy" invoke="createProductConfigItemContent" auth="true"> <description>Add Content To ProductConfigItem</description> <auto-attributes include="pk" mode="INOUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -1142,7 +1142,7 @@ under the License. <!--<override name="contentId" optional="true" mode="INOUT"/>--> </service> <service name="updateProductConfigItemContent" default-entity-name="ProdConfItemContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/config/ProductConfigItemContentServices.groovy" invoke="updateProductConfigItemContent" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/config/ProductConfigItemContentServicesScript.groovy" invoke="updateProductConfigItemContent" auth="true"> <description>Update Content To ProductConfigItem</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> @@ -1154,7 +1154,7 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="createSimpleTextContentForProductConfigItem" default-entity-name="ProdConfItemContent" engine="groovy" - location="component://product/src/main/groovy/org/apache/ofbiz/product/product/config/ProductConfigItemContentServices.groovy" invoke="createSimpleTextContentForProductConfigItem" auth="true"> + location="component://product/src/main/groovy/org/apache/ofbiz/product/product/config/ProductConfigItemContentServicesScript.groovy" invoke="createSimpleTextContentForProductConfigItem" auth="true"> <attribute name="configItemId" type="String" mode="IN" optional="false"></attribute> <attribute name="contentId" type="String" mode="IN" optional="true"></attribute> <auto-attributes include="pk" mode="IN" optional="true"/> diff --git a/framework/common/servicedef/services.xml b/framework/common/servicedef/services.xml index d4137dccfe..50a9724d7f 100644 --- a/framework/common/servicedef/services.xml +++ b/framework/common/servicedef/services.xml @@ -26,7 +26,7 @@ under the License. <!-- Common Permission Service --> <service name="commonGenericPermission" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="commonGenericPermission"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="commonGenericPermission"> <implements service="permissionInterface"/> </service> @@ -186,7 +186,7 @@ under the License. <auto-attributes mode="IN" include="pk" optional="false"/> </service> <service name="createFuturePeriod" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="createFuturePeriod" auth="true"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="createFuturePeriod" auth="true"> <description>Create a future CustomTimePeriod</description> </service> @@ -292,7 +292,7 @@ under the License. <!-- Keyword Thesaurus services --> <service name="createKeywordThesaurus" default-entity-name="KeywordThesaurus" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="createKeywordThesaurus" auth="true"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="createKeywordThesaurus" auth="true"> <description>Create a Keyword Thesaurus</description> <permission-service service-name="catalogPermissionCheck" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -306,7 +306,7 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="false"/> </service> <service name="deleteKeywordThesaurus" default-entity-name="KeywordThesaurus" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="deleteKeywordThesaurus" auth="true"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="deleteKeywordThesaurus" auth="true"> <description>Delete a Keyword Thesaurus</description> <permission-service service-name="catalogPermissionCheck" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -320,7 +320,7 @@ under the License. <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="convertUom" default-entity-name="UomConversion" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="convertUom" auth="false"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="convertUom" auth="false"> <description>Make a unit of measure conversion, first using UomConversionDated, then with UomConversion</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="asOfDate" mode="IN" type="Timestamp" optional="true"/> @@ -332,7 +332,7 @@ under the License. <attribute name="defaultRoundingMode" mode="IN" type="String" optional="true"/> </service> <service name="convertUomCustom" default-entity-name="UomConversion" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="convertUomCustom" auth="false"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="convertUomCustom" auth="false"> <description>Make a unit of measure conversion, using CustomMethod entity</description> <auto-attributes include="pk" mode="IN" optional="false"/> <attribute name="originalValue" mode="IN" type="BigDecimal" optional="false"/> @@ -342,7 +342,7 @@ under the License. </service> <service name="checkUomConversion" engine="groovy" default-entity-name="UomConversion" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="checkUomConversion"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="checkUomConversion"> <description>Returns true if an UomConversion record exists</description> <permission-service service-name="commonGenericPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN"/> @@ -350,7 +350,7 @@ under the License. </service> <service name="checkUomConversionDated" engine="groovy" default-entity-name="UomConversionDated" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="checkUomConversionDated"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="checkUomConversionDated"> <description>Returns true if an UomConversionDated record exists</description> <permission-service service-name="commonGenericPermission" main-action="VIEW"/> <auto-attributes include="pk" mode="IN"/> @@ -358,7 +358,7 @@ under the License. </service> - <service name="getFileUploadProgressStatus" engine="groovy" location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getFileUploadProgressStatus" auth="false"> + <service name="getFileUploadProgressStatus" engine="groovy" location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getFileUploadProgressStatus" auth="false"> <description>Look up progress made in File Upload process</description> <attribute name="uploadProgressListener" mode="IN" type="org.apache.ofbiz.webapp.event.FileUploadProgressListener" optional="true"/> <attribute name="contentLength" mode="OUT" type="Long" optional="true"/> @@ -538,7 +538,7 @@ under the License. <!-- Visual theme services --> <service name="getVisualThemeResources" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getVisualThemeResources"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getVisualThemeResources"> <description>Get a visual theme resources Map. Call with visualThemeId String, and optional themeResources Map. Returns themeResources Map - a Map of Lists, where the resourceTypeEnumId is the key and the value @@ -761,7 +761,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="linkGeos" engine="groovy" auth="true" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="linkGeos"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="linkGeos"> <description>Link Geos to another Geo</description> <permission-service service-name="commonGenericPermission" main-action="CREATE"/> <attribute name="geoIds" type="List" mode="IN" optional="true"/> @@ -769,18 +769,18 @@ under the License. <attribute name="geoAssocTypeId" type="String" mode="IN"/> </service> <service name="getRelatedGeos" engine="groovy" auth="false" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getRelatedGeos"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getRelatedGeos"> <attribute name="geoId" mode="IN" type="String"/> <attribute name="geoAssocTypeId" mode="IN" type="String"/> <attribute name="geoList" mode="OUT" type="java.util.List"/> </service> <service name="getCountryList" engine="groovy" auth="false" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getCountryList"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getCountryList"> <description>Get a list of country and associated states from Geo</description> <attribute name="countryList" mode="OUT" type="java.util.List"/> </service> <service name="getAssociatedStateList" engine="groovy" auth="false" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getAssociatedStateList"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getAssociatedStateList"> <attribute name="countryGeoId" mode="IN" type="String" optional="false"/> <attribute name="listOrderBy" mode="IN" type="String" optional="true"/> <attribute name="stateList" mode="OUT" type="java.util.List"/> @@ -812,17 +812,17 @@ under the License. </service> <service name="getServerTimestamp" engine="groovy" auth="false" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getServerTimestamp"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getServerTimestamp"> <attribute name="serverTimestamp" mode="OUT" type="Timestamp"/> </service> <service name="getServerTimeZone" engine="groovy" auth="false" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getServerTimeZone"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getServerTimeZone"> <attribute name="serverTimeZone" mode="OUT" type="String"/> </service> <service name="getServerTimestampAsLong" engine="groovy" auth="false" - location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy" invoke="getServerTimestampAsLong"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy" invoke="getServerTimestampAsLong"> <attribute name="serverTimestamp" mode="OUT" type="Long"/> </service> diff --git a/framework/common/servicedef/services_email.xml b/framework/common/servicedef/services_email.xml index 22125fab42..a286320402 100644 --- a/framework/common/servicedef/services_email.xml +++ b/framework/common/servicedef/services_email.xml @@ -130,7 +130,7 @@ under the License. <implements service="sendMailFromScreenInterface"/> </service> <service name="sendMailFromTemplateSetting" engine="groovy" - location="component://common/src/main/groovy/org/apache/ofbiz/common/email/EmailServices.groovy" invoke="sendMailFromTemplateSetting"> + location="component://common/src/main/groovy/org/apache/ofbiz/common/email/EmailServicesScript.groovy" invoke="sendMailFromTemplateSetting"> <description>Send Email From Email Template Setting Service</description> <implements service="sendMailInterface"/> <attribute name="emailTemplateSettingId" type="String" mode="IN" optional="false"/> diff --git a/framework/common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy b/framework/common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy similarity index 100% rename from framework/common/src/main/groovy/org/apache/ofbiz/common/CommonServices.groovy rename to framework/common/src/main/groovy/org/apache/ofbiz/common/CommonServicesScript.groovy diff --git a/framework/common/src/main/groovy/org/apache/ofbiz/common/email/EmailServices.groovy b/framework/common/src/main/groovy/org/apache/ofbiz/common/email/EmailServicesScript.groovy similarity index 100% rename from framework/common/src/main/groovy/org/apache/ofbiz/common/email/EmailServices.groovy rename to framework/common/src/main/groovy/org/apache/ofbiz/common/email/EmailServicesScript.groovy