You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/03/19 13:50:52 UTC
svn commit: r755977 - in /ofbiz/trunk: applications/accounting/servicedef/
applications/content/servicedef/ applications/marketing/servicedef/
applications/order/servicedef/ framework/common/servicedef/
Author: jleroux
Date: Thu Mar 19 12:50:51 2009
New Revision: 755977
URL: http://svn.apache.org/viewvc?rev=755977&view=rev
Log:
all components
Following best practice.
Changed location="org/ofbiz/......... to location="component:// in the service location attribute.
using <service name=(.*)engine="simple"(.*)location="org/ofbiz => <service name=$1engine="simple"$2location="component://{componentName}/script/org/ofbiz
with {componentName} done by hand
Also for bsh and groovy (services_test in copmmon). There is no longer any location="org/ofbiz in OFBiz
Modified:
ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
ofbiz/trunk/applications/content/servicedef/services.xml
ofbiz/trunk/applications/marketing/servicedef/services.xml
ofbiz/trunk/applications/order/servicedef/services_return.xml
ofbiz/trunk/framework/common/servicedef/services.xml
ofbiz/trunk/framework/common/servicedef/services_test.xml
Modified: ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml?rev=755977&r1=755976&r2=755977&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_invoice.xml Thu Mar 19 12:50:51 2009
@@ -282,7 +282,7 @@
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
<!-- Auto generate Invoice for fixed period -->
- <service name="autoGenerateInvoiceFromExistingInvoice" engine="simple" location="org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="autoGenerateInvoiceFromExistingInvoice">
+ <service name="autoGenerateInvoiceFromExistingInvoice" engine="simple" location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="autoGenerateInvoiceFromExistingInvoice">
<description>Scheduled service to generate Invoice from an existing Invoice</description>
<attribute name="recurrenceInfoId" mode="IN" type="String" optional="false"/>
</service>
Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=755977&r1=755976&r2=755977&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Thu Mar 19 12:50:51 2009
@@ -263,14 +263,14 @@
</service>
<!-- Generic Content Services -->
- <service name="createEmailContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="createEmailContent">
+ <service name="createEmailContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createEmailContent">
<auto-attributes mode="IN" entity-name="Content" optional="true"/>
<attribute name="subject" type="String" mode="IN" optional="false"/>
<attribute name="plainBody" type="String" mode="IN" optional="false"/>
<attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/>
<override name="contentId" mode="INOUT"/>
</service>
- <service name="updateEmailContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="updateEmailContent">
+ <service name="updateEmailContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateEmailContent">
<attribute name="subjectDataResourceId" type="String" mode="IN" optional="true"/>
<attribute name="subject" type="String" mode="IN" optional="true"/>
<attribute name="plainBodyDataResourceId" type="String" mode="IN" optional="true"/>
@@ -279,22 +279,22 @@
<attribute name="htmlBody" type="String" mode="IN" optional="true" allow-html="any"/>
</service>
- <service name="createDownloadContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="createDownloadContent">
+ <service name="createDownloadContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createDownloadContent">
<auto-attributes mode="IN" entity-name="Content" optional="true"/>
<attribute name="file" type="String" mode="IN" optional="false"/>
<override name="contentId" mode="INOUT"/>
</service>
- <service name="updateDownloadContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="updateDownloadContent">
+ <service name="updateDownloadContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateDownloadContent">
<attribute name="fileDataResourceId" type="String" mode="IN" optional="true"/>
<attribute name="file" type="String" mode="IN" optional="true"/>
</service>
- <service name="createSimpleTextContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="createSimpleTextContent">
+ <service name="createSimpleTextContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createSimpleTextContent">
<auto-attributes mode="IN" entity-name="Content" optional="true"/>
<attribute name="text" type="String" mode="IN" optional="false" allow-html="safe"/>
<override name="contentId" mode="INOUT"/>
</service>
- <service name="updateSimpleTextContent" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="updateSimpleTextContent">
+ <service name="updateSimpleTextContent" engine="simple" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateSimpleTextContent">
<attribute name="textDataResourceId" type="String" mode="IN" optional="true"/>
<attribute name="text" type="String" mode="IN" optional="true" allow-html="safe"/>
</service>
@@ -1099,7 +1099,7 @@
<attribute name="articleContentId" type="String" mode="OUT" optional="true"/>
<attribute name="summaryContentId" type="String" mode="OUT" optional="true"/>
</service>
- <service name="getOwnedOrPublishedBlogEntries" engine="simple" location="org/ofbiz/content/blog/BlogServices.xml" invoke="getOwnedOrPublishedBlogEntries"
+ <service name="getOwnedOrPublishedBlogEntries" engine="simple" location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="getOwnedOrPublishedBlogEntries"
auth="true" transaction-timeout="72000">
<attribute type="String" mode="IN" name="contentId" optional="false"/>
<attribute mode="IN" name="userLogin" optional="false" type="GenericValue"/>
Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=755977&r1=755976&r2=755977&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Thu Mar 19 12:50:51 2009
@@ -459,7 +459,7 @@
<attribute name="extension" type="String" mode="IN" optional="true"/>
<attribute name="partyId" type="String" mode="OUT" optional="false"/>
</service>
- <service name="convertLeadToContact" engine="simple" location="org/ofbiz/sfa/lead/LeadServices.xml" invoke="convertLeadToContact">
+ <service name="convertLeadToContact" engine="simple" location="component://marketing/script/org/ofbiz/sfa/lead/LeadServices.xml" invoke="convertLeadToContact">
<attribute name="partyId" type="String" mode="INOUT" optional="false"/>
<attribute name="partyGroupId" type="String" mode="IN" optional="true"/>
<attribute name="partyGroupId" type="String" mode="OUT" optional="false"/>
Modified: ofbiz/trunk/applications/order/servicedef/services_return.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_return.xml?rev=755977&r1=755976&r2=755977&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_return.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_return.xml Thu Mar 19 12:50:51 2009
@@ -135,12 +135,12 @@
<attribute name="originalReturnQuantity" type="BigDecimal" mode="IN" optional="true"/>
<override name="returnAdjustmentId" optional="false"/>
</service>
- <service name="removeReturnAdjustment" engine="simple" location="org/ofbiz/order/order/OrderReturnServices.xml"
+ <service name="removeReturnAdjustment" engine="simple" location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml"
invoke="removeReturnAdjustment">
<description>Simple remove service</description>
<auto-attributes entity-name="ReturnAdjustment" include="pk" mode="IN" optional="false"/>
</service>
- <service name="createReturnAndItemOrAdjustment" engine="simple" location="org/ofbiz/order/order/OrderReturnServices.xml"
+ <service name="createReturnAndItemOrAdjustment" engine="simple" location="component://order/script/org/ofbiz/order/order/OrderReturnServices.xml"
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"/>
Modified: ofbiz/trunk/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=755977&r1=755976&r2=755977&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services.xml Thu Mar 19 12:50:51 2009
@@ -335,7 +335,7 @@
<attribute name="conversionParameters" mode="IN" type="Map" optional="true"/>
<attribute name="convertedValue" mode="OUT" type="BigDecimal" optional="true"/>
</service>
- <service name="getFileUploadProgressStatus" engine="simple" location="org/ofbiz/common/CommonServices.xml" invoke="getFileUploadProgressStatus" auth="false">
+ <service name="getFileUploadProgressStatus" engine="simple" location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="getFileUploadProgressStatus" auth="false">
<description>Look up progress made in File Upload process</description>
<attribute name="uploadProgressListener" mode="IN" type="org.ofbiz.webapp.event.FileUploadProgressListener" optional="true"/>
<attribute name="contentLength" mode="OUT" type="Long" optional="true"/>
Modified: ofbiz/trunk/framework/common/servicedef/services_test.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_test.xml?rev=755977&r1=755976&r2=755977&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services_test.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services_test.xml Thu Mar 19 12:50:51 2009
@@ -97,13 +97,13 @@
<attribute name="result" type="String" mode="OUT"/>
</service>
- <service name="testBsh" engine="bsh" location="org/ofbiz/common/BshServiceTest.bsh" invoke="">
+ <service name="testBsh" engine="bsh" location="component://common/script/org/ofbiz/common/BshServiceTest.bsh" invoke="">
<description>Test BeanShell Script Service</description>
<attribute name="message" type="String" mode="IN" optional="true"/>
<attribute name="result" type="String" mode="OUT"/>
</service>
- <service name="testGroovy" engine="groovy" location="org/ofbiz/common/GroovyServiceTest.groovy" invoke="">
+ <service name="testGroovy" engine="groovy" location="component://common/script/org/ofbiz/common/GroovyServiceTest.groovy" invoke="">
<description>Test Groovy Script Service</description>
<attribute name="message" type="String" mode="IN" optional="true"/>
<attribute name="result" type="String" mode="OUT"/>
@@ -137,7 +137,7 @@
</service>
<service name="testJavaScript" engine="javascript" auth="false"
- location="org/ofbiz/common/JavaScriptTest.js" invoke="">
+ location="component://common/script/org/ofbiz/common/JavaScriptTest.js" invoke="">
<description>Test JavaScript Service</description>
<attribute name="message" type="String" mode="IN" optional="true"/>
<attribute name="result" type="String" mode="OUT" optional="true"/>