Author: jleroux
Date: Mon Apr 6 13:24:59 2009 New Revision: 762329 URL: http://svn.apache.org/viewvc?rev=762329&view=rev Log: Fix services timeout issueq reported in user ML (only in content component) Modified: ofbiz/trunk/applications/content/servicedef/services.xml ofbiz/trunk/applications/content/servicedef/services_content.xml ofbiz/trunk/applications/content/servicedef/services_survey.xml Modified: ofbiz/trunk/applications/content/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=762329&r1=762328&r2=762329&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services.xml Mon Apr 6 13:24:59 2009 @@ -18,7 +18,7 @@ under the License. --> -<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> <description>Content Component Services</description> <vendor>OFBiz</vendor> @@ -53,7 +53,7 @@ <attribute mode="IN" name="filterByDate" optional="true" type="Boolean"/> <attribute mode="OUT" name="subContentList" optional="true" type="java.util.List"/> </service> - + <service name="getSubSubContentWithPermCheck" engine="simple" auth="true" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="getSubSubContentWithPermCheck"> <description>Get Content associated with Content</description> @@ -70,7 +70,7 @@ <auto-attributes include="pk" mode="IN" optional="false"/> <attribute mode="OUT" name="resultData" optional="true" type="java.util.Map"/> </service> - + <service name="getDataResource" engine="simple" default-entity-name="DataResource" auth="true" location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="getDataResource"> <description>Get Content and resource information</description> @@ -95,7 +95,7 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeDataCategory" engine="simple" default-entity-name="DataCategory" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataCategory"> + location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataCategory"> <description>Remove DataCategory</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -168,7 +168,7 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeContentPurposeOperation" engine="simple" default-entity-name="ContentPurposeOperation" auth="true" - location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentPurposeOperation"> + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentPurposeOperation"> <description>Remove ContentPurposeOperation</description> <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -256,7 +256,7 @@ <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeDataResourceRole" engine="simple" default-entity-name="DataResourceRole" auth="true" - location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceRole"> + location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceRole"> <description>Remove DataResourceRole</description> <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> @@ -308,7 +308,7 @@ </service> <!-- Complex Contentservices --> - + <!-- simply use createContent and the accoc will be created too" --> <!--service name="createContentAndAssoc" default-entity-name="Content" engine="simple" location="org/ofbiz/content/content/ContentServices.xml" invoke="createContentAndAssoc" auth="true"> @@ -417,7 +417,7 @@ </service> --> - <service name="persistContentAndAssoc" engine="java" transaction-timeout="72000" + <service name="persistContentAndAssoc" engine="java" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="persistContentAndAssoc" auth="true"> <description>Create a Content, DataResource and/or ContentAssoc</description> <permission-service service-name="genericContentPermission" main-action="CREATE"/> @@ -447,7 +447,7 @@ <attribute mode="INOUT" name="caContentAssocTypeId" optional="true" type="String"/> <attribute mode="INOUT" name="caFromDate" optional="true" type="Timestamp"/> <attribute mode="INOUT" name="caSequenceNum" optional="true" type="Long"/> - <attribute mode="IN" name="ownerContentId" optional="true" type="String"/> + <attribute mode="IN" name="ownerContentId" optional="true" type="String"/> <attribute mode="IN" name="rootDir" optional="true" type="String"/> <attribute mode="IN" name="targetOperationList" optional="true" type="List"/> <attribute mode="IN" name="contentPurposeList" optional="true" type="List"/> @@ -464,9 +464,9 @@ <attribute mode="IN" name="displayFailCond" optional="true" type="Boolean"/> <attribute mode="INOUT" name="roleTypeList" optional="true" type="List"/> </service> - + <service name="persistDataResourceAndData" engine="java" - transaction-timeout="72000" + transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="persistDataResourceAndData" auth="true"> <description>Persist a DataResource and data</description> <auto-attributes entity-name="DataResource" include="all" mode="IN" optional="true" > @@ -493,40 +493,40 @@ <attribute mode="IN" name="forceElectronicText" optional="true" type="String"/> <attribute mode="IN" name="displayFailCond" optional="true" type="Boolean"/> </service> - + <service name="persistCompDocContent" engine="simple" - transaction-timeout="72000" + transaction-timeout="7200" location="org/ofbiz/content/compdoc/CompDocServices.xml" invoke="persistCompDocContent" auth="true"> <description>Persist a CompDoc DataResource and data</description> <implements service="persistDataResourceAndData"/> <attribute name="contentRevisionSeqId" type="String" mode="OUT" optional="false"/> <attribute name="rootContentId" type="String" mode="IN" optional="true"/> </service> - + <service name="persistCompDocPdf2Survey" engine="simple" - transaction-timeout="72000" + transaction-timeout="7200" location="org/ofbiz/content/compdoc/CompDocServices.xml" invoke="persistCompDocPdf2Survey" auth="true"> <description>Upload/save PDF, create Survey, populate Content</description> <implements service="persistCompDocContent"/> <attribute name="pdfName" type="String" mode="IN" optional="true"/> </service> - + <service name="persistContentWithRevision" engine="java" - transaction-timeout="72000" + transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="persistContentWithRevision" auth="true"> <implements service="persistContentAndAssoc"/> <attribute mode="IN" name="masterRevisionContentId" optional="false" type="String"/> </service> - + <service name="findContentParents" engine="java" - transaction-timeout="72000" + transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="findContentParents" auth="true"> <attribute mode="IN" name="contentId" optional="false" type="String"/> <attribute mode="IN" name="contentAssocTypeId" optional="false" type="String"/> <attribute mode="IN" name="direction" optional="true" type="String"/> <attribute mode="OUT" name="parentList" optional="true" type="List"/> </service> - + <service name="deactivateAssocs" engine="java" location="org.ofbiz.content.content.ContentServices" invoke="deactivateAssocs" auth="true"> <description>Supply thruDate to all ContentAssoc that come "before" current one</description> @@ -540,7 +540,7 @@ </service> <service name="deactivateContentAssoc" engine="java" - transaction-timeout="72000" + transaction-timeout="7200" location="org.ofbiz.content.content.ContentServices" invoke="deactivateContentAssoc" auth="true"> <description>Set thruDate to now for ContentAssoc entity</description> <attribute mode="IN" name="contentIdTo" optional="true" type="String"/> @@ -657,14 +657,14 @@ <attribute name="fieldValue0" type="String" mode="IN" optional="true"/> </service> - <service name="indexTree" auth="true" engine="java" validate="true" transaction-timeout="72000" + <service name="indexTree" auth="true" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.search.SearchServices" invoke="indexTree"> <description>Index content under publish point</description> <attribute mode="IN" name="contentId" optional="false" type="String"/> <attribute mode="OUT" name="badIndexList" optional="true" type="List"/> <attribute mode="OUT" name="goodIndexCount" optional="true" type="Integer"/> </service> - <service name="resequence" auth="true" engine="java" validate="true" transaction-timeout="72000" + <service name="resequence" auth="true" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="resequence"> <description>Reorder sequence numbers in ContentAssoc entities for a given parent id</description> <attribute mode="IN" name="contentIdTo" optional="false" type="String"/> @@ -674,39 +674,39 @@ <attribute mode="IN" name="contentAssocTypeId" optional="true" type="String"/> <attribute mode="IN" name="dir" optional="true" type="String"/> </service> - <service name="changeLeafToNode" validate="true" auth="true" engine="java" transaction-timeout="72000" + <service name="changeLeafToNode" validate="true" auth="true" engine="java" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="changeLeafToNode"> <description>Moves dataResource to separate content associated with current content so that node can have only children, no content of its own</description> <attribute mode="IN" name="contentId" optional="false" type="String"/> <attribute mode="IN" name="userLogin" optional="true" type="GenericValue"/> </service> - - <service name="updatePageType" auth="true" engine="java" validate="true" transaction-timeout="72000" + + <service name="updatePageType" auth="true" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="updatePageType"> <description>Change contentTypeId to OUTLINE/PAGE/SUBPAGE_NODE</description> <attribute mode="IN" name="contentId" optional="false" type="String"/> <attribute mode="IN" name="pageMode" optional="true" type="String"/> </service> - <service name="resetToOutlineMode" auth="true" engine="java" validate="true" transaction-timeout="72000" + <service name="resetToOutlineMode" auth="true" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="resetToOutlineMode"> <description>Set content and kids to OUTLINE_NODE</description> <attribute mode="IN" name="contentId" optional="false" type="String"/> <attribute mode="IN" name="pageMode" optional="true" type="String"/> </service> - <service name="clearContentAssocViewCache" auth="true" engine="java" validate="true" transaction-timeout="72000" + <service name="clearContentAssocViewCache" auth="true" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="clearContentAssocViewCache"> <description>Clear cache</description> </service> - <service name="clearContentAssocDataResourceViewCache" auth="true" engine="java" validate="true" transaction-timeout="72000" + <service name="clearContentAssocDataResourceViewCache" auth="true" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="clearContentAssocDataResourceViewCache"> <description>Clear cache</description> </service> - <service name="findSubNodes" auth="false" engine="java" validate="true" transaction-timeout="72000" + <service name="findSubNodes" auth="false" engine="java" validate="true" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="findSubNodes"> <description>Get children of content</description> <attribute mode="IN" name="contentId" optional="false" type="String"/> @@ -733,28 +733,28 @@ <attribute name="contentAssocTypeId" type="String" mode="IN" optional="true"/> </service> - <service name="updateContentChildStats" engine="java" transaction-timeout="72000" + <service name="updateContentChildStats" engine="java" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="updateContentChildStats"> <description>Set childLeafCount and childBranchCount in passed id and those below</description> <attribute name="contentId" type="String" mode="IN" optional="false"/> <attribute name="contentAssocTypeId" type="String" mode="IN" optional="true"/> </service> - <service name="updateImage" engine="java" transaction-timeout="72000" + <service name="updateImage" engine="java" transaction-timeout="7200" location="org.ofbiz.content.data.DataServices" invoke="updateImage"> <description>Update image</description> <attribute name="dataResourceId" type="String" mode="IN" optional="false"/> <attribute name="imageData" type="java.nio.ByteBuffer" mode="IN" optional="false"/> </service> - <service name="createImage" engine="java" transaction-timeout="72000" + <service name="createImage" engine="java" transaction-timeout="7200" location="org.ofbiz.content.data.DataServices" invoke="createImage"> <description>Create image</description> <attribute name="dataResourceId" type="String" mode="IN" optional="false"/> <attribute name="imageData" type="java.nio.ByteBuffer" mode="IN" optional="false"/> </service> - <service name="updateContentSubscription" engine="java" transaction-timeout="72000" auth="true" + <service name="updateContentSubscription" engine="java" transaction-timeout="7200" auth="true" location="org.ofbiz.content.ContentManagementServices" invoke="updateContentSubscription"> <description>Creates or updates ContentRole</description> <attribute name="partyId" type="String" mode="IN" optional="false"/> @@ -763,7 +763,7 @@ <attribute name="useTimeUomId" type="String" mode="IN" optional="false"/> <attribute name="useTime" type="Integer" mode="IN" optional="false"/> </service> - <service name="updateContentSubscriptionByProduct" engine="java" transaction-timeout="72000" auth="true" + <service name="updateContentSubscriptionByProduct" engine="java" transaction-timeout="7200" auth="true" location="org.ofbiz.content.ContentManagementServices" invoke="updateContentSubscriptionByProduct"> <description>Creates or updates ContentRole</description> <attribute name="partyId" type="String" mode="IN" optional="false"/> @@ -771,47 +771,47 @@ <attribute name="orderCreatedDate" type="Timestamp" mode="IN" optional="true" /> <attribute name="quantity" type="Integer" mode="IN" optional="false"/> </service> - <service name="updateContentSubscriptionByOrder" engine="java" transaction-timeout="72000" auth="true" + <service name="updateContentSubscriptionByOrder" engine="java" transaction-timeout="7200" auth="true" location="org.ofbiz.content.ContentManagementServices" invoke="updateContentSubscriptionByOrder"> <description>Creates or updates ContentRole</description> <attribute name="orderId" type="String" mode="IN" optional="false"/> </service> - <service name="followNodeChildren" auth="true" engine="java" transaction-timeout="72000" + <service name="followNodeChildren" auth="true" engine="java" transaction-timeout="7200" location="org.ofbiz.content.ContentManagementServices" invoke="followNodeChildren"> <description>Descend thru content tree and execute service at each node</description> <attribute name="contentId" type="String" mode="IN" optional="false"/> <attribute name="serviceName" type="String" mode="IN" optional="false"/> <attribute name="contentAssocTypeId" type="String" mode="IN" optional="true"/> </service> - <service name="publishContent" auth="true" engine="java" transaction-timeout="72000" + <service name="publishContent" auth="true" engine="java" transaction-timeout="7200" location="org.ofbiz.content.content.ContentServices" invoke="publishContent"> <description>Change statusId to published (CTNT_PUBLISHED)</description> <attribute mode="IN" name="content" optional="false" type="GenericValue"/> </service> <!-- these three services are for use in screen widget files --> - <service name="getPrefixedMembers" auth="false" engine="java" transaction-timeout="72000" + <service name="getPrefixedMembers" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.content.ContentServices" invoke="getPrefixedMembers"> <description>Gets all the members of the input map that start with the prefix</description> <attribute mode="IN" name="mapIn" optional="true" type="java.util.Map"/> <attribute name="prefix" type="String" mode="IN" optional="false"/> <attribute mode="OUT" name="mapOut" optional="true" type="java.util.Map"/> </service> - <service name="splitString" auth="false" engine="java" transaction-timeout="72000" + <service name="splitString" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.content.ContentServices" invoke="splitString"> <description>Splits input string </description> <attribute name="inputString" type="String" mode="IN" optional="true"/> <attribute name="delimiter" type="String" mode="IN" optional="true"/> <attribute mode="OUT" name="outputList" optional="true" type="java.util.List"/> </service> - <service name="joinString" auth="false" engine="java" transaction-timeout="72000" + <service name="joinString" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.content.ContentServices" invoke="joinString"> <description>Splits input string </description> <attribute name="inputList" type="java.util.List" mode="IN" optional="false"/> <attribute name="delimiter" type="String" mode="IN" optional="true"/> <attribute mode="OUT" name="outputString" optional="true" type="String"/> </service> - <service name="urlEncodeArgs" auth="false" engine="java" transaction-timeout="72000" + <service name="urlEncodeArgs" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.content.ContentServices" invoke="urlEncodeArgs"> <description>URL encodes map</description> <attribute name="mapIn" type="java.util.Map" mode="IN" optional="false"/> @@ -958,7 +958,7 @@ <attribute name="contentRevisionSeqId" type="String" mode="OUT" optional="false"/> <attribute name="rootContentId" type="String" mode="IN" optional="true"/> </service> - + <service name="cloneTemplateContentApprovals" engine="simple" location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" invoke="cloneTemplateContentApprovals" auth="true"> @@ -966,7 +966,7 @@ <attribute name="contentRevisionSeqId" type="String" mode="IN" optional="false"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> </service> - + <service name="cloneInstanceContentApprovals" engine="simple" location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" invoke="cloneInstanceContentApprovals" auth="true"> @@ -974,7 +974,7 @@ <attribute name="contentRevisionSeqId" type="String" mode="IN" optional="true"/> <attribute name="contentId" type="String" mode="IN" optional="false"/> </service> - + <service name="checkForWaitingApprovals" engine="simple" location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml" invoke="checkForWaitingApprovals" auth="true"> @@ -992,7 +992,7 @@ </service> <!-- Open Office Services --> - <service name="convertDocumentByteBuffer" auth="false" engine="java" transaction-timeout="72000" + <service name="convertDocumentByteBuffer" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.openoffice.OpenOfficeServices" invoke="convertDocumentByteBuffer"> <description>Use OpenOffice to convert between document types</description> <attribute name="oooHost" type="String" mode="IN" optional="true"/> @@ -1002,7 +1002,7 @@ <attribute name="inByteBuffer" type="java.nio.ByteBuffer" mode="IN" optional="false"/> <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="false"/> </service> - <service name="convertDocument" auth="false" engine="java" transaction-timeout="72000" + <service name="convertDocument" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.openoffice.OpenOfficeServices" invoke="convertDocument"> <description>Use OpenOffice to convert between document types</description> <attribute name="oooHost" type="String" mode="IN" optional="true"/> @@ -1011,7 +1011,7 @@ <attribute name="filenameTo" type="String" mode="IN" optional="false"/> <attribute name="convertFilterName" type="String" mode="IN" optional="true"/> </service> - <service name="convertDocumentFileToFile" auth="false" engine="java" transaction-timeout="72000" + <service name="convertDocumentFileToFile" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.openoffice.OpenOfficeServices" invoke="convertDocumentFileToFile"> <description>Use OpenOffice to convert between document types</description> <attribute name="oooHost" type="String" mode="IN" optional="true"/> @@ -1021,7 +1021,7 @@ <attribute name="inputMimeType" type="String" mode="IN" optional="true"/> <attribute name="outputMimeType" type="String" mode="IN" optional="true"/> </service> - <service name="compareDocuments" auth="false" engine="java" transaction-timeout="72000" + <service name="compareDocuments" auth="false" engine="java" transaction-timeout="7200" location="org.ofbiz.content.openoffice.OpenOfficeServices" invoke="compareDocuments"> <description>Use OpenOffice to compare two documents</description> <attribute name="oooHost" type="String" mode="IN" optional="true"/> @@ -1100,7 +1100,7 @@ <attribute name="summaryContentId" type="String" mode="OUT" optional="true"/> </service> <service name="getOwnedOrPublishedBlogEntries" engine="simple" location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="getOwnedOrPublishedBlogEntries" - auth="true" transaction-timeout="72000"> + auth="true" transaction-timeout="7200"> <attribute type="String" mode="IN" name="contentId" optional="false"/> <attribute mode="IN" name="userLogin" optional="false" type="GenericValue"/> <attribute mode="OUT" name="blogList" optional="true" type="List"/> @@ -1111,7 +1111,7 @@ location="org.ofbiz.content.blog.BlogRssServices" invoke="generateBlogRssFeed"> <description>Blog RSS Feed</description> <implements service="rssFeedInterface"/> - <attribute name="blogContentId" type="String" mode="IN" optional="false"/> + <attribute name="blogContentId" type="String" mode="IN" optional="false"/> </service> <!-- eca helper services --> @@ -1139,15 +1139,15 @@ <attribute name="ownerContentId" type="String" mode="IN" optional="true"/> <attribute name="contentIdFrom" type="String" mode="IN" optional="true"/> <attribute name="contentIdTo" type="String" mode="IN" optional="true"/> - <attribute name="contentId" type="String" mode="IN" optional="true"/> + <attribute name="contentId" type="String" mode="IN" optional="true"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <attribute name="contentPurposeTypeId" type="String" mode="IN" optional="true"/> + <attribute name="contentPurposeTypeId" type="String" mode="IN" optional="true"/> <attribute name="contentOperationId" type="String" mode="IN" optional="true"/> </service> <service name="genericDataResourcePermission" engine="simple" auth="true" location="component://content/script/org/ofbiz/content/permission/DataResourcePermissionServices.xml" invoke="genericDataResourcePermission"> <description>Generic DataResource Permission Service; Takes mainAction to determine the mode.</description> <implements service="permissionInterface"/> - <attribute name="dataResourceId" type="String" mode="IN" optional="true"/> + <attribute name="dataResourceId" type="String" mode="IN" optional="true"/> </service> </services> Modified: ofbiz/trunk/applications/content/servicedef/services_content.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_content.xml?rev=762329&r1=762328&r2=762329&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_content.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_content.xml Mon Apr 6 13:24:59 2009 @@ -37,7 +37,7 @@ <attribute mode="IN" name="displayFailCond" optional="true" type="Boolean"/> <attribute mode="INOUT" name="roleTypeList" optional="true" type="List"/> <!-- end of deprecated fields --> - <attribute name="contentPurposeTypeId" type="String" mode="IN" optional="true"/> + <attribute name="contentPurposeTypeId" type="String" mode="IN" optional="true"/> <attribute name="contentAssocTypeId" type="String" mode="IN" optional="true"/> <attribute name="contentIdFrom" type="String" mode="IN" optional="true"/> <attribute name="contentIdTo" type="String" mode="IN" optional="true"/> @@ -47,7 +47,7 @@ <attribute name="contentId" type="String" mode="INOUT" optional="true"/> <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/> <override name="contentTypeId" default-value="DOCUMENT"/> - + </service> <service name="createTextAndUploadedContent" engine="simple" auth="true" @@ -121,7 +121,7 @@ <implements service="updateContentAssoc" optional="true"/> <auto-attributes entity-name="Content" include="pk" mode="INOUT" optional="false"/> <auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/> - <attribute name="contentPurposeTypeId" type="String" mode="IN" optional="true"/> + <attribute name="contentPurposeTypeId" type="String" mode="IN" optional="true"/> <!-- TODO: the following fields are depricated; but will not be removed until all services and callers are updated --> <attribute mode="IN" name="targetOperationList" optional="true" type="List"/> <attribute mode="IN" name="skipPermissionCheck" optional="true" type="String"/> @@ -152,7 +152,7 @@ <!-- TODO: old permission service; being replaced with genericContentPermission --> <service name="checkContentPermission" - transaction-timeout="72000" + transaction-timeout="7200" auth="false" engine="java" invoke="checkContentPermission" location="org.ofbiz.content.content.ContentPermissionServices"> <description>Check for permission to perform operation on Content</description> @@ -197,7 +197,7 @@ <!--Content Assoc services.--> <!-- TODO: old permission service; being replaced with genericContentPermission --> - <service name="checkAssocPermission" engine="java" transaction-timeout="72000" auth="true" + <service name="checkAssocPermission" engine="java" transaction-timeout="7200" auth="true" location="org.ofbiz.content.content.ContentPermissionServices" invoke="checkAssocPermission"> <description>Check for permission to perform operation on Content</description> <attribute mode="IN" name="targetOperationList" optional="true" type="List"/> Modified: ofbiz/trunk/applications/content/servicedef/services_survey.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_survey.xml?rev=762329&r1=762328&r2=762329&view=diff ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_survey.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_survey.xml Mon Apr 6 13:24:59 2009 @@ -18,7 +18,7 @@ under the License. --> -<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> <description>Content Component Services</description> <vendor>OFBiz</vendor> @@ -44,7 +44,7 @@ <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - + <!-- TODO <service name="cloneSurvey" auth="true" engine="simple" location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="cloneSurvey"> @@ -78,7 +78,7 @@ <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - + <!-- SurveyMultiRespColumn Services --> <service name="createSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="simple" location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyMultiRespColumn"> @@ -102,7 +102,7 @@ <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - + <!-- SurveyPage Services --> <service name="createSurveyPage" default-entity-name="SurveyPage" auth="true" engine="simple" location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyPage"> @@ -126,7 +126,7 @@ <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - + <!-- SurveyApplType Services --> <service name="createSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="simple" location="component://content/script/org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyApplType"> @@ -303,7 +303,7 @@ <attribute name="surveyResponseId" type="String" mode="IN" optional="false"/> </service> - <service name="buildSurveyFromPdf" engine="java" + <service name="buildSurveyFromPdf" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildSurveyFromPdf" auth="false"> <description>Create a Survey and related entities from AcroForm</description> <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> @@ -313,7 +313,7 @@ <attribute name="surveyId" type="String" mode="INOUT" optional="true"/> </service> - <service name="buildSurveyResponseFromPdf" engine="java" transaction-timeout="72000" + <service name="buildSurveyResponseFromPdf" engine="java" transaction-timeout="7200" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildSurveyResponseFromPdf" auth="false"> <description>Create a Survey and related entities from AcroForm</description> <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> @@ -324,7 +324,7 @@ <attribute name="surveyResponseId" type="String" mode="INOUT" optional="true"/> </service> - <service name="getAcroFieldsFromPdf" engine="java" + <service name="getAcroFieldsFromPdf" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="getAcroFieldsFromPdf" auth="false"> <description>Get fields from AcroForm</description> <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> @@ -333,7 +333,7 @@ <attribute name="acroFieldMap" type="Map" mode="OUT" optional="false"/> </service> - <service name="setAcroFieldsFromSurveyResponse" engine="java" + <service name="setAcroFieldsFromSurveyResponse" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="setAcroFieldsFromSurveyResponse" auth="false"> <description>Get fields from AcroForm</description> <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> @@ -343,7 +343,7 @@ <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="true" /> </service> - <service name="setAcroFields" engine="java" + <service name="setAcroFields" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="setAcroFields" auth="false"> <description>Get fields from AcroForm</description> <attribute name="pdfFileNameIn" type="String" mode="IN" optional="true" /> @@ -353,16 +353,16 @@ <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="true" /> </service> - <service name="buildPdfFromSurveyResponse" engine="java" + <service name="buildPdfFromSurveyResponse" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildPdfFromSurveyResponse" auth="false"> <description>Build Pdf From Survey Response</description> <attribute name="surveyResponseId" type="String" mode="IN" optional="false" /> <attribute name="outByteBuffer" type="java.nio.ByteBuffer" mode="OUT" optional="false" /> - </service> - <service name="buildSurveyQuestionsAndAnswers" engine="java" + </service> + <service name="buildSurveyQuestionsAndAnswers" engine="java" location="org.ofbiz.content.survey.PdfSurveyServices" invoke="buildSurveyQuestionsAndAnswers" auth="false"> <description>Build list of questions and answers From Survey Response</description> <attribute name="surveyResponseId" type="String" mode="IN" optional="false" /> <attribute name="questionsAndAnswers" type="List" mode="OUT" optional="false" /> - </service> + </service> </services> |
Free forum by Nabble | Edit this page |