You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2009/04/28 01:53:42 UTC
svn commit: r769205 - in /ofbiz/trunk:
applications/product/servicedef/services_maint.xml
framework/minilang/dtd/simple-methods.xsd framework/service/dtd/services.xsd
Author: lektran
Date: Mon Apr 27 23:53:40 2009
New Revision: 769205
URL: http://svn.apache.org/viewvc?rev=769205&view=rev
Log:
Corrected simple method documentation regarding the transaction timeout UOM, added the same to the services xsd and fixed a couple of service defs that appeared
to be specifying milliseconds rather than seconds.
Modified:
ofbiz/trunk/applications/product/servicedef/services_maint.xml
ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
ofbiz/trunk/framework/service/dtd/services.xsd
Modified: ofbiz/trunk/applications/product/servicedef/services_maint.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_maint.xml?rev=769205&r1=769204&r2=769205&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_maint.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_maint.xml Mon Apr 27 23:53:40 2009
@@ -51,24 +51,24 @@
<!-- ========================================= -->
<!-- These are generally run manually, but some can be run on a schedule as well. -->
<service name="discVirtualsWithDiscVariants" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="discVirtualsWithDiscVariants" auth="true" transaction-timeout="36000000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="discVirtualsWithDiscVariants" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>Discontinue Virtuals With Discontinued Variants</description>
</service>
<service name="removeCategoryMembersOfDiscProducts" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="removeCategoryMembersOfDiscProducts" auth="true" transaction-timeout="36000000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="removeCategoryMembersOfDiscProducts" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>Remove Category Members Of Discontinued Products</description>
</service>
<service name="removeDuplicateOpenEndedCategoryMembers" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="removeDuplicateOpenEndedCategoryMembers" auth="true" transaction-timeout="36000000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="removeDuplicateOpenEndedCategoryMembers" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>Remove Duplicate, excluding fromDate, Category Members that have no thruDate</description>
</service>
<service name="makeStandAloneFromSingleVariantVirtuals" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="makeStandAloneFromSingleVariantVirtuals" auth="true" transaction-timeout="36000000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="makeStandAloneFromSingleVariantVirtuals" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>Make Stand Alone From Single Variant Virtuals</description>
</service>
<service name="mergeVirtualWithSingleVariant" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="mergeVirtualWithSingleVariant" auth="true" transaction-timeout="3600000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="mergeVirtualWithSingleVariant" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>A service to be called by the make stand alone service to do the operation for one product.</description>
<attribute name="productId" type="String" mode="IN" optional="false"/>
<attribute name="removeOld" type="Boolean" mode="IN" optional="false"/>
@@ -76,17 +76,17 @@
</service>
<service name="setAllProductImageNames" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="setAllProductImageNames" auth="true" transaction-timeout="36000000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="setAllProductImageNames" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>Set All Product Image Names; pattern example: /images/products/${size}/${productId}.jpg; defaults to values in the catalog.properties file (image.url.prefix + / + image.filename.format)</description>
<attribute name="pattern" type="String" mode="IN" optional="true"/>
</service>
<service name="clearAllVirtualProductImageNames" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="clearAllVirtualProductImageNames" auth="true" transaction-timeout="36000000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="clearAllVirtualProductImageNames" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>Set All Product Image Names</description>
</service>
<service name="attachProductFeaturesToCategory" engine="java"
- location="org.ofbiz.product.product.ProductUtilServices" invoke="attachProductFeaturesToCategory" auth="true" transaction-timeout="36000000" require-new-transaction="true">
+ location="org.ofbiz.product.product.ProductUtilServices" invoke="attachProductFeaturesToCategory" auth="true" transaction-timeout="36000" require-new-transaction="true">
<description>Attach Product Features To Category Through Groups</description>
<attribute name="productCategoryId" type="String" mode="IN" optional="false"/>
<attribute name="doSubCategories" type="String" mode="IN" optional="true"/>
@@ -94,7 +94,7 @@
<!-- Check Urls exists or not related services -->
<service name="checkImageUrlForAllCategories" engine="simple"
- location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="checkImageUrlForAllCategories" transaction-timeout="36000000">
+ location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="checkImageUrlForAllCategories" transaction-timeout="36000">
<description>check For Image Urls exists or not for all categories</description>
<attribute name="topCategory" type="String" mode="IN" optional="true"/>
<attribute name="excludeEmpty" type="Boolean" mode="IN" optional="true"/>
Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd?rev=769205&r1=769204&r2=769205&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd Mon Apr 27 23:53:40 2009
@@ -578,8 +578,9 @@
<xs:attribute type="xs:string" name="transaction-timeout">
<xs:annotation>
<xs:documentation>
- Defines the time out for the transaction, in milliseconds.
- None by defaults.
+ Defines the timeout for the transaction, in seconds.
+ Defaults to the value set in the service definition which in turn defaults to the setting
+ in the TransactionFactory being used (typically 60 seconds).
</xs:documentation>
</xs:annotation>
</xs:attribute>
Modified: ofbiz/trunk/framework/service/dtd/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/dtd/services.xsd?rev=769205&r1=769204&r2=769205&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/dtd/services.xsd (original)
+++ ofbiz/trunk/framework/service/dtd/services.xsd Mon Apr 27 23:53:40 2009
@@ -101,7 +101,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="transaction-timeout" type="xs:int" default="0"/>
+ <xs:attribute name="transaction-timeout" type="xs:int" default="0">
+ <xs:annotation>
+ <xs:documentation>
+ Defines the timeout for the transaction, in seconds.
+ Defaults to the value set in the TransactionFactory being used (typically 60 seconds).
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="max-retry" type="xs:int" default="-1"/>
<xs:attribute name="debug" default="false">
<xs:simpleType>