Author: nmalin
Date: Tue Nov 24 22:21:53 2015
New Revision: 1716271
URL: http://svn.apache.org/viewvc?rev=1716271&view=rev
Log:
convert entities crud service from simple to entity-auto for :
* WebSiteRole
* WebSitePathAlias
* WebSiteContentType
* WebSiteContent
* WebSite
* DataResourcePurpose
* DataResourceMetaData
* OtherDataResource
* AudioDataResource
* VideoDataResource
* ImageDataResource
* DataResource (update/delete)
* ContentApproval
* ContentRevisionItem
* ContentRevision
I also move some service definition from file services.xml to
services_content.xml for ContentApproval, ContentRevisionItem and
ContentRevision
relate issue OFBIZ-6745
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
ofbiz/trunk/applications/content/servicedef/services.xml
ofbiz/trunk/applications/content/servicedef/services_content.xml
ofbiz/trunk/applications/content/servicedef/services_data.xml
ofbiz/trunk/applications/content/servicedef/services_website.xml
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=1716271&r1=1716270&r2=1716271&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
(original)
+++
ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
Tue Nov 24 22:21:53 2015
@@ -323,70 +323,6 @@ under the License.
<!-- =============== =============== =============== --><!--
=============== Revision Services =============== --><!-- ===============
=============== =============== -->
- <!-- Methods for ContentRevision -->
- <simple-method method-name="createContentRevision"
short-description="Create ContentRevision">
- <check-permission action="_CREATE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityCreatePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentRevision" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateContentRevision"
short-description="Update ContentRevision">
- <check-permission action="_UPDATE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityUpdatePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentRevision"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentRevision"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeContentRevision"
short-description="Remove ContentRevision">
- <check-permission action="_DELETE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityDeletePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentRevision"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentRevision"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
- <!-- Methods for ContentRevisionItem -->
- <simple-method method-name="createContentRevisionItem"
short-description="Create ContentRevisionItem">
- <check-permission action="_CREATE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityCreatePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentRevisionItem" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateContentRevisionItem"
short-description="Update ContentRevisionItem">
- <check-permission action="_UPDATE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityUpdatePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentRevisionItem"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentRevisionItem"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeContentRevisionItem"
short-description="Remove ContentRevisionItem">
- <check-permission action="_DELETE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityDeletePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentRevisionItem"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentRevisionItem"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<!-- Methods for ContentRevision and ContentRevisionItem -->
<simple-method method-name="persistContentRevisionAndItem"
short-description="Update ContentRevision and ContentRevisionItem">
<entity-condition entity-name="ContentRevision"
list="contentRevisionList">
@@ -480,46 +416,6 @@ under the License.
<!-- =============== =============== =============== --><!--
=============== Approval Services =============== --><!-- ===============
=============== =============== -->
- <!-- Methods for ContentApproval -->
- <simple-method method-name="createContentApproval"
short-description="Create ContentApproval">
- <log level="always" message="got into createContentApproval(4)"/>
- <check-permission action="_CREATE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityCreatePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentApproval" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.contentApprovalId">
- <sequenced-id sequence-name="ContentApproval"
field="newEntity.contentApprovalId"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- <check-errors/>
- <field-to-result result-name="contentApprovalId"
field="newEntity.contentApprovalId"/>
- </simple-method>
- <simple-method method-name="updateContentApproval"
short-description="Update ContentApproval">
- <log level="always" message="got into updateContentApproval(4)"/>
- <check-permission action="_UPDATE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityUpdatePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentApproval"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentApproval"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeContentApproval"
short-description="Remove ContentApproval">
- <check-permission action="_DELETE" permission="CONTENTMGR">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityDeletePermission"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="ContentApproval"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ContentApproval"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<simple-method method-name="getApprovalsWithPermissions"
short-description="Get ContentApprovals for approval process">
<!-- this seems like an awkward way to get the previous
ContentApproval entities, but
if you are not sure what previous contentRevisionSeqId is, then
it is necessary to ask.
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1716271&r1=1716270&r2=1716271&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
(original)
+++
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
Tue Nov 24 22:21:53 2015
@@ -63,22 +63,6 @@ under the License.
<field-to-result field="newEntity" result-name="dataResource"/>
</simple-method>
- <simple-method method-name="updateDataResource" short-description="Update
a Data Resource">
- <entity-one entity-name="DataResource" value-field="lookedUpValue"/>
- <to-string field="parameters.locale"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <now-timestamp field="nowTimestamp"/>
- <set field="lookedUpValue.lastModifiedByUserLogin"
from-field="userLogin.userLoginId"/>
- <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/>
- <store-value value-field="lookedUpValue"/>
- <field-to-result field="parameters.dataResourceId"
result-name="dataResourceId"/>
- </simple-method>
-
- <simple-method method-name="deleteDataResource" short-description="Delete
a Data Resource">
- <entity-one entity-name="DataResource" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<simple-method method-name="createDataResourceAndAssocToContent"
short-description="Create a Data Resource and return the data resource type">
<entity-one value-field="content" entity-name="Content"/>
<if-empty field="content">
@@ -107,78 +91,6 @@ under the License.
<if-compare field="dataResource.dataResourceTypeId" operator="equals"
value="IMAGE_OBJECT"><return
response-code="${dataResource.dataResourceTypeId}"/></if-compare>
</simple-method>
- <!-- Methods for DataResourceMetaData -->
- <simple-method method-name="createDataResourceMetaData"
short-description="Create Data Resource Meta Data">
- <check-permission permission="CONTENTMGR" action="_CREATE">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityCreatePermission"/>
- </check-permission>
- <check-errors/>
-
- <make-value entity-name="DataResourceMetaData"
value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateDataResourceMetaData"
short-description="Update Data Resource Meta Data">
- <check-permission permission="CONTENTMGR" action="_UPDATE">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityUpdatePermission"/>
- </check-permission>
- <check-errors/>
-
- <make-value entity-name="DataResourceMetaData"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="DataResourceMetaData"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeDataResourceMetaData"
short-description="Remove Data Resource Meta Data">
- <check-permission permission="CONTENTMGR" action="_DELETE">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityDeletePermission"/>
- </check-permission>
- <check-errors/>
-
- <make-value entity-name="DataResourceMetaData"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="DataResourceMetaData"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- Methods for DataResourcePurpose -->
- <simple-method method-name="createDataResourcePurpose"
short-description="Create Data Resource Purpose">
- <check-permission permission="CONTENTMGR" action="_CREATE">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityCreatePermission"/>
- </check-permission>
- <check-errors/>
-
- <make-value entity-name="DataResourcePurpose" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateDataResourcePurpose"
short-description="Update Data Resource Purpose">
- <check-permission permission="CONTENTMGR" action="_UPDATE">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityUpdatePermission"/>
- </check-permission>
- <check-errors/>
-
- <make-value entity-name="DataResourcePurpose"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="DataResourcePurpose"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeDataResourcePurpose"
short-description="Remove Data Resource Purpose">
- <check-permission permission="CONTENTMGR" action="_DELETE">
- <fail-property resource="ContentUiLabels"
property="ContentSecurityDeletePermission"/>
- </check-permission>
- <check-errors/>
-
- <make-value entity-name="DataResourcePurpose"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="DataResourcePurpose"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- Methods for DataResourceRole -->
<simple-method method-name="createDataResourceRole"
short-description="Create Data Resource Role">
<if-not-empty field="parameters.partyId">
@@ -406,91 +318,6 @@ under the License.
<remove-value value-field="lookedUpValue"/>
</simple-method>
- <!-- Methods for ImageDataResource -->
- <simple-method method-name="createImageDataResource"
short-description="Create Image Data Resource">
- <make-value entity-name="ImageDataResource" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateImageDataResource"
short-description="Update Image Data Resource">
- <make-value entity-name="ImageDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ImageDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeImageDataResource"
short-description="Remove Image Data Resource">
- <make-value entity-name="ImageDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="ImageDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- Methods for VideoDataResource -->
- <simple-method method-name="createVideoDataResource"
short-description="Create Video Data Resource">
- <make-value entity-name="VideoDataResource" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateVideoDataResource"
short-description="Update Video Data Resource">
- <make-value entity-name="VideoDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="VideoDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeVideoDataResource"
short-description="Remove Video Data Resource">
- <make-value entity-name="VideoDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="VideoDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- Methods for AudioDataResource -->
- <simple-method method-name="createAudioDataResource"
short-description="Create Audio Data Resource">
- <make-value entity-name="AudioDataResource" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateAudioDataResource"
short-description="Update Audio Data Resource">
- <make-value entity-name="AudioDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="AudioDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeAudioDataResource"
short-description="Remove Audio Data Resource">
- <make-value entity-name="AudioDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="AudioDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- Methods for OtherDataResource -->
- <simple-method method-name="createOtherDataResource"
short-description="Create Other Data Resource">
- <make-value entity-name="OtherDataResource" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- <log level="always" message="created new OtherDataResource:
${newEntity}"/>
- </simple-method>
- <simple-method method-name="updateOtherDataResource"
short-description="Update Other Data Resource">
- <make-value entity-name="OtherDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="OtherDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeOtherDataResource"
short-description="Remove Other Data Resource">
- <make-value entity-name="OtherDataResource"
value-field="lookupKeyValue"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="OtherDataResource"
map="lookupKeyValue" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!--
getElectronicText
Passed a Content GenericValue or a contentId, this service returns the
text data from
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=1716271&r1=1716270&r2=1716271&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
(original)
+++
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
Tue Nov 24 22:21:53 2015
@@ -21,97 +21,8 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd";>
- <!-- WebSite Services -->
- <simple-method method-name="createWebSite" short-description="Create a
WebSite">
- <make-value value-field="newEntity" entity-name="WebSite"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
-
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateWebSite" short-description="Update a
WebSite">
- <entity-one entity-name="WebSite" value-field="webSite"/>
- <set-nonpk-fields map="parameters" value-field="webSite"/>
- <store-value value-field="webSite"/>
- </simple-method>
- <simple-method method-name="removeWebSite" short-description="Remove a
WebSite">
- <make-value value-field="lookupKeyValue" entity-name="WebSite"/>
- <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
- <find-by-primary-key entity-name="WebSite" map="lookupKeyValue"
value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- WebSite Content -->
- <simple-method method-name="createWebSiteContent"
short-description="Create WebSite Content">
- <make-value value-field="newEntity" entity-name="WebSiteContent"/>
- <set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-field="newEntity" map="parameters"/>
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateWebSiteContent"
short-description="Update WebSite Content">
- <make-value value-field="lookupPKMap" entity-name="WebSiteContent"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSiteContent" map="lookupPKMap"
value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeWebSiteContent"
short-description="Remove WebSite Content">
- <make-value value-field="lookupPKMap" entity-name="WebSiteContent"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSiteContent" map="lookupPKMap"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- WebSite Content Type Services -->
- <simple-method method-name="createWebSiteContentType"
short-description="Create WebSite Content Type">
- <make-value value-field="newEntity" entity-name="WebSiteContentType"/>
- <set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-field="newEntity" map="parameters"/>
- <if-empty field="newEntity.webSiteContentTypeId">
- <sequenced-id sequence-name="WebSiteContentTypeId"
field="webSiteContentTypeId"/>
- <set field="newEntity.webSiteContentTypeId"
from-field="webSiteContentTypeId"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateWebSiteContentType"
short-description="Update WebSite Content Type">
- <make-value value-field="lookupPKMap"
entity-name="WebSiteContentType"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSiteContentType"
map="lookupPKMap" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeWebSiteContentType"
short-description="Remove WebSite Content Type">
- <make-value value-field="lookupPKMap"
entity-name="WebSiteContentType"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSiteContentType"
map="lookupPKMap" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<!-- WebSite Path Alias -->
- <simple-method method-name="createWebSitePathAlias"
short-description="Create WebSite Path Alias">
- <make-value value-field="newEntity" entity-name="WebSitePathAlias"/>
- <set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-field="newEntity" map="parameters"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateWebSitePathAlias"
short-description="Update WebSite Path Alias">
- <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap"
value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeWebSitePathAlias"
short-description="Remove WebSite Path Alias">
- <make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSitePathAlias" map="lookupPKMap"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<simple-method method-name="getWebSitePathAlias"
short-description="Returns a WebSite Path Alias">
<make-value value-field="lookupPKMap" entity-name="WebSitePathAlias"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
@@ -119,33 +30,6 @@ under the License.
<field-to-result field="alias.pathTo" result-name="pathTo"/>
</simple-method>
- <!-- WebSite Role Services -->
- <simple-method method-name="createWebSiteRole" short-description="Create
WebSite Role">
- <make-value value-field="newEntity" entity-name="WebSiteRole"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp"/>
- </if-empty>
-
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateWebSiteRole" short-description="Update
WebSite Role">
- <make-value value-field="lookupPKMap" entity-name="WebSiteRole"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSiteRole" map="lookupPKMap"
value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeWebSiteRole" short-description="Remove
WebSite Role">
- <make-value value-field="lookupPKMap" entity-name="WebSiteRole"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key entity-name="WebSiteRole" map="lookupPKMap"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- quick create website CMS content -->
<simple-method method-name="quickCreateWebSiteContent"
short-description="Auto-Create WebSite CMS Content">
<entity-one entity-name="WebSite" value-field="webSite">
Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=1716271&r1=1716270&r2=1716271&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Tue Nov 24
22:21:53 2015
@@ -682,75 +682,6 @@
<attribute mode="OUT" name="outputString" optional="true"
type="String"/>
</service>
- <!-- Content Revision services -->
- <service name="createContentRevision" engine="simple"
default-entity-name="ContentRevision" auth="true"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
invoke="createContentRevision">
- <description>Create a ContentRevision</description>
- <auto-attributes include="pk" mode="IN" optional="true"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="updateContentRevision" engine="simple"
default-entity-name="ContentRevision" auth="true"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
invoke="updateContentRevision">
- <description>Update a ContentRevision</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="removeContentRevision" engine="simple"
default-entity-name="ContentRevision" auth="true"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
invoke="removeContentRevision">
- <description>Remove ContentRevision</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
-
- <!-- Content Revision Item services -->
- <service name="createContentRevisionItem" engine="simple"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="createContentRevisionItem"
- default-entity-name="ContentRevisionItem" auth="true">
- <description>Create a ContentRevisionItem</description>
- <auto-attributes include="pk" mode="IN" optional="true"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="updateContentRevisionItem" engine="simple"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="updateContentRevisionItem"
- default-entity-name="ContentRevisionItem" auth="true">
- <description>Update a ContentRevisionItem</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="removeContentRevisionItem" engine="simple"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="removeContentRevisionItem"
- default-entity-name="ContentRevisionItem" auth="true">
- <description>Remove ContentRevisionItem</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
-
- <!-- Content Approval services -->
- <service name="createContentApproval" engine="simple"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="createContentApproval"
- default-entity-name="ContentApproval" auth="true">
- <description>Create a ContentApproval</description>
- <auto-attributes include="pk" mode="INOUT" optional="true"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="updateContentApproval" engine="simple"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="updateContentApproval"
- default-entity-name="ContentApproval" auth="true">
- <description>Update a ContentApproval</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="removeContentApproval" engine="simple"
-
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="removeContentApproval"
- default-entity-name="ContentApproval" auth="true">
- <description>Remove ContentApproval</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
-
<!-- ================ CompDoc Requests ================= -->
<service name="persistContentRevisionAndItem" engine="simple"
location="component://content/script/org/ofbiz/content/compdoc/CompDocServices.xml"
Modified: ofbiz/trunk/applications/content/servicedef/services_content.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_content.xml?rev=1716271&r1=1716270&r2=1716271&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_content.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_content.xml Tue Nov 24
22:21:53 2015
@@ -482,4 +482,61 @@
<attribute name="contentId" type="String" mode="IN" optional="false"/>
</service>
+ <!-- Content Revision services -->
+ <service name="createContentRevision" engine="entity-auto"
default-entity-name="ContentRevision" auth="true" invoke="create">
+ <description>Create a ContentRevision</description>
+ <permission-service service-name="genericContentPermission"
main-action="CREATE"/>
+ <auto-attributes include="pk" mode="IN" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateContentRevision" engine="entity-auto"
default-entity-name="ContentRevision" auth="true" invoke="update">
+ <description>Update a ContentRevision</description>
+ <permission-service service-name="genericContentPermission"
main-action="UPDATE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="removeContentRevision" engine="entity-auto"
default-entity-name="ContentRevision" auth="true" invoke="delete">
+ <description>Remove ContentRevision</description>
+ <permission-service service-name="genericContentPermission"
main-action="DELETE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- Content Revision Item services -->
+ <service name="createContentRevisionItem" engine="entity-auto"
default-entity-name="ContentRevisionItem" auth="true" invoke="create">
+ <description>Create a ContentRevisionItem</description>
+ <permission-service service-name="genericContentPermission"
main-action="CREATE"/>
+ <auto-attributes include="pk" mode="IN" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateContentRevisionItem" engine="entity-auto"
default-entity-name="ContentRevisionItem" auth="true" invoke="update">
+ <description>Update a ContentRevisionItem</description>
+ <permission-service service-name="genericContentPermission"
main-action="UPDATE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="removeContentRevisionItem" engine="entity-auto"
default-entity-name="ContentRevisionItem" auth="true" invoke="delete">
+ <description>Remove ContentRevisionItem</description>
+ <permission-service service-name="genericContentPermission"
main-action="DELETE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- Content Approval services -->
+ <service name="createContentApproval" engine="entity-auto"
default-entity-name="ContentApproval" auth="true" invoke="create">
+ <description>Create a ContentApproval</description>
+ <permission-service service-name="genericContentPermission"
main-action="CREATE"/>
+ <auto-attributes include="pk" mode="INOUT" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateContentApproval" engine="entity-auto"
default-entity-name="ContentApproval" auth="true" invoke="update">
+ <description>Update a ContentApproval</description>
+ <permission-service service-name="genericContentPermission"
main-action="UPDATE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="removeContentApproval" engine="entity-auto"
default-entity-name="ContentApproval" auth="true" invoke="delete">
+ <description>Remove ContentApproval</description>
+ <permission-service service-name="genericContentPermission"
main-action="DELETE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
</services>
Modified: ofbiz/trunk/applications/content/servicedef/services_data.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_data.xml?rev=1716271&r1=1716270&r2=1716271&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_data.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_data.xml Tue Nov 24
22:21:53 2015
@@ -48,22 +48,15 @@
<attribute name="contentId" type="String" mode="INOUT"
optional="false"/>
<attribute name="templateDataResource" type="String" mode="IN"
optional="true"/>
</service>
- <service name="updateDataResource" engine="simple"
default-entity-name="DataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="updateDataResource">
+ <service name="updateDataResource" engine="entity-auto"
default-entity-name="DataResource" auth="true" invoke="update">
<description>Update a DataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="UPDATE"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <attribute name="dataResourceId" type="String" mode="IN"
optional="false"/>
- <attribute name="targetOperationList" type="List" mode="IN"
optional="true"/>
- <attribute name="contentPurposeList" type="List" mode="IN"
optional="true"/>
- <attribute name="skipPermissionCheck" type="String" mode="IN"
optional="true"/>
- <attribute name="dataResourceId" type="String" mode="OUT"
optional="false"/>
- <attribute name="dataResource" type="org.ofbiz.entity.GenericValue"
mode="OUT" optional="true"/>
+ <attribute name="dataResourceId" type="String" mode="INOUT"
optional="false"/>
<override name="objectInfo" allow-html="any"/>
<override name="dataResourceName" allow-html="any"/>
</service>
- <service name="removeDataResource" engine="simple"
default-entity-name="DataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="deleteDataResource">
+ <service name="removeDataResource" engine="entity-auto"
default-entity-name="DataResource" auth="true" invoke="delete">
<description>Remove DataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -142,92 +135,118 @@
</service>
<!-- Image Data Resource services -->
- <service name="createImageDataResource" engine="simple"
default-entity-name="ImageDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="createImageDataResource">
+ <service name="createImageDataResource" engine="entity-auto"
default-entity-name="ImageDataResource" auth="true" invoke="create">
<description>Create an ImageDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateImageDataResource" engine="simple"
default-entity-name="ImageDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="updateImageDataResource">
+ <service name="updateImageDataResource" engine="entity-auto"
default-entity-name="ImageDataResource" auth="true" invoke="update">
<description>Update an ImageDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeImageDataResource" engine="simple"
default-entity-name="ImageDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="removeImageDataResource">
+ <service name="removeImageDataResource" engine="entity-auto"
default-entity-name="ImageDataResource" auth="true" invoke="delete">
<description>Remove an ImageDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- Video Data Resource services -->
- <service name="createVideoDataResource" engine="simple"
default-entity-name="VideoDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="createVideoDataResource">
+ <service name="createVideoDataResource" engine="entity-auto"
default-entity-name="VideoDataResource" auth="true" invoke="create">
<description>Create a VideoDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateVideoDataResource" engine="simple"
default-entity-name="VideoDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="updateVideoDataResource">
+ <service name="updateVideoDataResource" engine="entity-auto"
default-entity-name="VideoDataResource" auth="true" invoke="update">
<description>Update an VideoDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeVideoDataResource" engine="simple"
default-entity-name="VideoDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="removeVideoDataResource">
+ <service name="removeVideoDataResource" engine="entity-auto"
default-entity-name="VideoDataResource" auth="true" invoke="delete">
<description>Remove an VideoDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- Audio Data Resource services -->
- <service name="createAudioDataResource" engine="simple"
default-entity-name="AudioDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="createAudioDataResource">
+ <service name="createAudioDataResource" engine="entity-auto"
default-entity-name="AudioDataResource" auth="true" invoke="create">
<description>Create an AudioDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateAudioDataResource" engine="simple"
default-entity-name="AudioDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="updateAudioDataResource">
+ <service name="updateAudioDataResource" engine="entity-auto"
default-entity-name="AudioDataResource" auth="true" invoke="update">
<description>Update an AudioDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeAudioDataResource" engine="simple"
default-entity-name="AudioDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="removeAudioDataResource">
+ <service name="removeAudioDataResource" engine="entity-auto"
default-entity-name="AudioDataResource" auth="true" invoke="delete">
<description>Remove an AudioDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- Other Data Resource services -->
- <service name="createOtherDataResource" engine="simple"
default-entity-name="OtherDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="createOtherDataResource">
+ <service name="createOtherDataResource" engine="entity-auto"
default-entity-name="OtherDataResource" auth="true" invoke="create">
<description>Create an OtherDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateOtherDataResource" engine="simple"
default-entity-name="OtherDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="updateOtherDataResource">
+ <service name="updateOtherDataResource" engine="entity-auto"
default-entity-name="OtherDataResource" auth="true" invoke="update">
<description>Update an OtherDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeOtherDataResource" engine="simple"
default-entity-name="OtherDataResource" auth="true"
-
location="component://content/script/org/ofbiz/content/data/DataServices.xml"
invoke="removeOtherDataResource">
+ <service name="removeOtherDataResource" engine="entity-auto"
default-entity-name="OtherDataResource" auth="true" invoke="delete">
<description>Remove an OtherDataResource</description>
<permission-service service-name="genericDataResourcePermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
+
+ <!-- Data Resource Meta Services -->
+ <service name="createDataResourceMetaData" engine="entity-auto"
default-entity-name="DataResourceMetaData" auth="true" invoke="create">
+ <description>Create an DataResourceMetaData</description>
+ <permission-service service-name="genericDataResourcePermission"
main-action="CREATE"/>
+ <auto-attributes include="pk" mode="INOUT" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateDataResourceMetaData" engine="entity-auto"
default-entity-name="DataResourceMetaData" auth="true" invoke="update">
+ <description>Update an DataResourceMetaData</description>
+ <permission-service service-name="genericDataResourcePermission"
main-action="UPDATE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="removeDataResourceMetaData" engine="entity-auto"
default-entity-name="DataResourceMetaData" auth="true" invoke="delete">
+ <description>Remove an DataResourceMetaData</description>
+ <permission-service service-name="genericDataResourcePermission"
main-action="DELETE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <!-- Data Resource Purpose Services -->
+ <service name="createDataResourcePurpose" engine="entity-auto"
default-entity-name="DataResourcePurpose" auth="true" invoke="create">
+ <description>Create an DataResourcePurpose</description>
+ <permission-service service-name="genericDataResourcePermission"
main-action="CREATE"/>
+ <auto-attributes include="pk" mode="INOUT" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateDataResourcePurpose" engine="entity-auto"
default-entity-name="DataResourcePurpose" auth="true" invoke="update">
+ <description>Update an DataResourcePurpose</description>
+ <permission-service service-name="genericDataResourcePermission"
main-action="UPDATE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="removeDataResourcePurpose" engine="entity-auto"
default-entity-name="DataResourcePurpose" auth="true" invoke="delete">
+ <description>Remove an DataResourcePurpose</description>
+ <permission-service service-name="genericDataResourcePermission"
main-action="DELETE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
<!-- File services -->
<service name="createFile" engine="java"
Modified: ofbiz/trunk/applications/content/servicedef/services_website.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_website.xml?rev=1716271&r1=1716270&r2=1716271&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_website.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_website.xml Tue Nov 24
22:21:53 2015
@@ -23,16 +23,14 @@
<vendor>OFBiz</vendor>
<!-- WebSite Services -->
- <service name="createWebSite" default-entity-name="WebSite"
engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="createWebSite">
+ <service name="createWebSite" default-entity-name="WebSite"
engine="entity-auto" auth="true" invoke="create">
<description>Create a WebSite</description>
<permission-service service-name="contentManagerPermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="siteName" optional="false"/>
</service>
- <service name="updateWebSite" default-entity-name="WebSite"
engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="updateWebSite">
+ <service name="updateWebSite" default-entity-name="WebSite"
engine="entity-auto" auth="true" invoke="update">
<description>Update a WebSite</description>
<permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -40,67 +38,58 @@
</service>
<!-- WebSite Content Services -->
- <service name="createWebSiteContent" default-entity-name="WebSiteContent"
engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="createWebSiteContent">
+ <service name="createWebSiteContent" default-entity-name="WebSiteContent"
engine="entity-auto" auth="true" invoke="create">
<description>Create a WebSite Content</description>
<permission-service service-name="contentManagerPermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="updateWebSiteContent" default-entity-name="WebSiteContent"
engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="updateWebSiteContent">
+ <service name="updateWebSiteContent" default-entity-name="WebSiteContent"
engine="entity-auto" auth="true" invoke="update">
<description>Update a WebSite Content</description>
<permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeWebSiteContent" default-entity-name="WebSiteContent"
engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="removeWebSiteContent">
+ <service name="removeWebSiteContent" default-entity-name="WebSiteContent"
engine="entity-auto" auth="true" invoke="delete">
<description>Remove a WebSite Content</description>
<permission-service service-name="contentManagerPermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- WebSite ContentType Services -->
- <service name="createWebSiteContentType"
default-entity-name="WebSiteContentType" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="createWebSiteContentType">
+ <service name="createWebSiteContentType"
default-entity-name="WebSiteContentType" engine="entity-auto" auth="true"
invoke="create">
<description>Create a WebSite ContentType</description>
<permission-service service-name="contentManagerPermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateWebSiteContentType"
default-entity-name="WebSiteContentType" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="updateWebSiteContentType">
+ <service name="updateWebSiteContentType"
default-entity-name="WebSiteContentType" engine="entity-auto" auth="true"
invoke="update">
<description>Update a WebSite ContentType</description>
<permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeWebSiteContentType"
default-entity-name="WebSiteContentType" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="removeWebSiteContentType">
+ <service name="removeWebSiteContentType"
default-entity-name="WebSiteContentType" engine="entity-auto" auth="true"
invoke="delete">
<description>Remove a WebSite ContentType</description>
<permission-service service-name="contentManagerPermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- WebSite Path Alias Services -->
- <service name="createWebSitePathAlias"
default-entity-name="WebSitePathAlias" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="createWebSitePathAlias">
+ <service name="createWebSitePathAlias"
default-entity-name="WebSitePathAlias" engine="entity-auto" auth="true"
invoke="create">
<description>Create a WebSite Path Alias</description>
<permission-service service-name="contentManagerPermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateWebSitePathAlias"
default-entity-name="WebSitePathAlias" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="updateWebSitePathAlias">
+ <service name="updateWebSitePathAlias"
default-entity-name="WebSitePathAlias" engine="entity-auto" auth="true"
invoke="update">
<description>Update a WebSite Path Alias</description>
<permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeWebSitePathAlias"
default-entity-name="WebSitePathAlias" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="removeWebSitePathAlias">
+ <service name="removeWebSitePathAlias"
default-entity-name="WebSitePathAlias" engine="entity-auto" auth="true"
invoke="delete">
<description>Remove a WebSite Path Alias</description>
<permission-service service-name="contentManagerPermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -120,30 +109,26 @@
<override name="sequenceNum" optional="true"/>
</service>
- <service name="addWebSiteRole" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="createWebSiteRole">
+ <service name="addWebSiteRole" engine="entity-auto"
default-entity-name="WebSiteRole" auth="true" invoke="create">
<description>Add WebSite Role; NOTE: This service is being deprecated
in favor of createWebSiteRole</description>
- <permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
+ <permission-service service-name="contentManagerPermission"
main-action="CREATE"/>
<implements service="webSiteRoleInterface"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="createWebSiteRole" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="createWebSiteRole">
+ <service name="createWebSiteRole" engine="entity-auto"
default-entity-name="WebSiteRole" auth="true" invoke="create">
<description>Add WebSite Role</description>
- <permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
+ <permission-service service-name="contentManagerPermission"
main-action="CREATE"/>
<implements service="webSiteRoleInterface"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="updateWebSiteRole" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="updateWebSiteRole">
+ <service name="updateWebSiteRole" engine="entity-auto" auth="true"
default-entity-name="WebSiteRole" invoke="update">
<description>Add WebSite Role</description>
<permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
<implements service="webSiteRoleInterface"/>
</service>
- <service name="removeWebSiteRole" engine="simple" auth="true"
-
location="component://content/script/org/ofbiz/content/website/WebSiteServices.xml"
invoke="removeWebSiteRole">
+ <service name="removeWebSiteRole" engine="entity-auto" auth="true"
invoke="delete">
<description>Remove WebSite Role</description>
- <permission-service service-name="contentManagerPermission"
main-action="UPDATE"/>
+ <permission-service service-name="contentManagerPermission"
main-action="DELETE"/>
<auto-attributes entity-name="WebSiteRole" include="pk" mode="IN"
optional="false"/>
</service>
