Author: adrianc
Date: Sun Aug 28 11:12:57 2011
New Revision: 1162496
URL: http://svn.apache.org/viewvc?rev=1162496&view=rev
Log:
Converted Marketing Segment CRUD services to entity-auto.
Modified:
ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
ofbiz/trunk/applications/marketing/servicedef/services.xml
Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=1162496&r1=1162495&r2=1162496&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sun Aug 28
11:12:57 2011
@@ -814,27 +814,6 @@
<value xml:lang="zh">æ°å»ºååºç»åç±»</value>
<value xml:lang="zh_TW">æ°å»ºååçµåé¡</value>
</property>
- <property key="MarketingSegmentGroupClassificationCreatePermissionError">
- <value xml:lang="en">Error on creation Segment Group
Classification</value>
- <value xml:lang="it">Errore durante la creazione di una nuova
classificazione gruppo segmento</value>
- <value xml:lang="pt_BR">Erro ao criar grupo de classificação de
segmento</value>
- <value xml:lang="zh">å建ååºç»åç±»æ¶åºé</value>
- <value xml:lang="zh_TW">åµå»ºååçµå顿åºé¯</value>
- </property>
- <property key="MarketingSegmentGroupClassificationDeletePermissionError">
- <value xml:lang="en">Error on delete Segment Group
Classification</value>
- <value xml:lang="it">Errore durante la cancellazione di una
classificazione gruppo segmento</value>
- <value xml:lang="pt_BR">Erro ao excluir o grupo de classificação de
segmento</value>
- <value xml:lang="zh">å é¤ååºç»åç±»æ¶åºé</value>
- <value xml:lang="zh_TW">åªé¤ååçµå顿åºé¯</value>
- </property>
- <property key="MarketingSegmentGroupClassificationUpdatePermissionError">
- <value xml:lang="en">Error on update Segment Group
Classification</value>
- <value xml:lang="it">Errore durante l'aggiornamento di una
classificazione gruppo segmento</value>
- <value xml:lang="pt_BR">Erro ao atualizar o grupo de classificação
de segmento</value>
- <value xml:lang="zh">æ´æ°ååºç»åç±»æ¶åºé</value>
- <value xml:lang="zh_TW">æ´æ°ååçµå顿åºé¯</value>
- </property>
<property key="MarketingSegmentGroupCreate">
<value xml:lang="en">Create New Segment Group</value>
<value xml:lang="es">Nuevo segmento</value>
@@ -886,27 +865,6 @@
<value xml:lang="zh">æ°å»ºååºç»å°ç</value>
<value xml:lang="zh_TW">æ°å»ºååçµå°ç</value>
</property>
- <property key="MarketingSegmentGroupGeoCreatePermissionError">
- <value xml:lang="en">Error on creation Segment Group Geo</value>
- <value xml:lang="it">Errore durante la creazione di una nuova geo
gruppo segmento</value>
- <value xml:lang="pt_BR">Erro ao griar localização de grupo de
segmento</value>
- <value xml:lang="zh">å建ååºç»å°çæ¶åºé</value>
- <value xml:lang="zh_TW">åµå»ºååçµå°çæåºé¯</value>
- </property>
- <property key="MarketingSegmentGroupGeoDeletePermissionError">
- <value xml:lang="en">Error on delete Segment Group Geo</value>
- <value xml:lang="it">Errore durante la cancellazione di un geo gruppo
segmento</value>
- <value xml:lang="pt_BR">Erro ao excluir localização de grupo de
segmento</value>
- <value xml:lang="zh">å é¤ååºç»å°çæ¶åºé</value>
- <value xml:lang="zh_TW">åªé¤ååçµå°çæåºé¯</value>
- </property>
- <property key="MarketingSegmentGroupGeoUpdatePermissionError">
- <value xml:lang="en">Error on update Segment Group Geo</value>
- <value xml:lang="it">Errore durante l'aggiornamento di un nuovo geo
gruppo segmento</value>
- <value xml:lang="pt_BR">Erro ao atualizar a localização de grupo de
segmento</value>
- <value xml:lang="zh">æ´æ°ååºç»å°çæ¶åºé</value>
- <value xml:lang="zh_TW">æ´æ°ååçµå°çæåºé¯</value>
- </property>
<property key="MarketingSegmentGroupMgrViewPermissionError">
<value xml:lang="en">Segment Group View Permission Error</value>
<value xml:lang="it">Errore permesso di visualizzare i gruppi
segmento</value>
@@ -962,27 +920,6 @@
<value xml:lang="zh">æ°å»ºååºç»è§è²</value>
<value xml:lang="zh_TW">æ°å»ºååçµè§è²</value>
</property>
- <property key="MarketingSegmentGroupRoleCreatePermissionError">
- <value xml:lang="en">Error on creation Segment Group Role</value>
- <value xml:lang="it">Errore durante la creazione di un nuovo ruolo
gruppo segmento</value>
- <value xml:lang="pt_BR">Erro na criação do papel de Grupo de
Segmento</value>
- <value xml:lang="zh">å建ååºç»è§è²æ¶åºé</value>
- <value xml:lang="zh_TW">åµå»ºååçµè§è²æåºé¯</value>
- </property>
- <property key="MarketingSegmentGroupRoleDeletePermissionError">
- <value xml:lang="en">Error on delete Segment Group Role</value>
- <value xml:lang="it">Errore durante la cancellazione di un nuovo ruolo
gruppo segmento</value>
- <value xml:lang="pt_BR">Erro ao excluir o papel de grupo de
segmento</value>
- <value xml:lang="zh">å é¤ååºç»è§è²æ¶åºé</value>
- <value xml:lang="zh_TW">åªé¤ååçµè§è²æåºé¯</value>
- </property>
- <property key="MarketingSegmentGroupRoleUpdatePermissionError">
- <value xml:lang="en">Error on update Segment Group Role</value>
- <value xml:lang="it">Errore durante l'aggiornamento di un nuovo ruolo
gruppo segmento</value>
- <value xml:lang="pt_BR">Erro ao atualizar o papel de Grupo de
Segmento</value>
- <value xml:lang="zh">æ´æ°ååºç»è§è²æ¶åºé</value>
- <value xml:lang="zh_TW">æ´æ°ååçµè§è²æåºé¯</value>
- </property>
<property key="MarketingSegmentGroupSegmentGroup">
<value xml:lang="en">Segment</value>
<value xml:lang="es">Segmentos</value>
@@ -1081,13 +1018,6 @@
<value xml:lang="zh">ååºç»ç±»åæ è¯</value>
<value xml:lang="zh_TW">åå群çµé¡åID</value>
</property>
- <property key="MarketingSegmentGroupUpdatePermissionError">
- <value xml:lang="en">Error on update Segment Group</value>
- <value xml:lang="it">Errore durante l'aggiornamento di un gruppo
segmento</value>
- <value xml:lang="pt_BR">Erro ao atualizar Grupo de Segmento</value>
- <value xml:lang="zh">æ´æ°ååºç»æ¶åºé</value>
- <value xml:lang="zh_TW">æ´æ°ååçµæåºé¯</value>
- </property>
<property key="MarketingServiceError">
<value xml:lang="en">There was a problem processing your request.
Please try again. If the problem persists, please contact us.</value>
<value xml:lang="fr">Il y a eu un problème durant le traitement de
votre demande. SVP, essayez encore. Si le problème persiste, contactez-nous,
merci.</value>
Modified:
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=1162496&r1=1162495&r2=1162496&view=diff
==============================================================================
---
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
(original)
+++
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
Sun Aug 28 11:12:57 2011
@@ -21,129 +21,6 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
- <!-- SegmentGroup services -->
- <simple-method method-name="createSegmentGroup"
short-description="createSegmentGroup">
- <check-permission permission="MARKETING" action="_CREATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupCreatePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <make-value value-field="newEntity" entity-name="SegmentGroup"/>
- <sequenced-id sequence-name="SegmentGroup"
field="newEntity.segmentGroupId"/>
- <field-to-result field="newEntity.segmentGroupId"
result-name="segmentGroupId"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateSegmentGroup"
short-description="updateSegmentGroup">
- <check-permission permission="MARKETING" action="_UPDATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupUpdatePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <entity-one entity-name="SegmentGroup" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteSegmentGroup"
short-description="deleteSegmentGroup">
- <check-permission permission="MARKETING" action="_DELETE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupDeletePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <entity-one entity-name="SegmentGroup" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
-
- <!-- SegmentGroupClassification methods -->
- <simple-method method-name="createSegmentGroupClassification"
short-description="create a SegmentGroupClassification">
- <check-permission permission="MARKETING" action="_CREATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupClassificationCreatePermissionError"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="SegmentGroupClassification"
value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateSegmentGroupClassification"
short-description="update a SegmentGroupClassification">
- <check-permission permission="MARKETING" action="_UPDATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupClassificationUpdatePermissionError"/>
- </check-permission>
- <check-errors/>
- <entity-one entity-name="SegmentGroupClassification"
value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteSegmentGroupClassification"
short-description="delete a SegmentGroupClassification">
- <check-permission permission="MARKETING" action="_DELETE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupClassificationDeletePermissionError"/>
- </check-permission>
- <check-errors/>
- <entity-one entity-name="SegmentGroupClassification"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- SegmentGroupGeo methods -->
- <simple-method method-name="createSegmentGroupGeo"
short-description="create a SegmentGroupGeo">
- <check-permission permission="MARKETING" action="_CREATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupGeoCreatePermissionError"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="SegmentGroupGeo" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateSegmentGroupGeo"
short-description="update a SegmentGroupGeo">
- <check-permission permission="MARKETING" action="_UPDATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupGeoUpdatePermissionError"/>
- </check-permission>
- <check-errors/>
- <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteSegmentGroupGeo"
short-description="delete a SegmentGroupGeo">
- <check-permission permission="MARKETING" action="_DELETE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupGeoDeletePermissionError"/>
- </check-permission>
- <check-errors/>
- <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- SegmentGroupRole methods -->
- <simple-method method-name="createSegmentGroupRole"
short-description="create a SegmentGroupRole">
- <check-permission permission="MARKETING" action="_CREATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupRoleCreatePermissionError"/>
- </check-permission>
- <check-errors/>
- <make-value entity-name="SegmentGroupRole" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateSegmentGroupRole"
short-description="update a SegmentGroupRole">
- <check-permission permission="MARKETING" action="_UPDATE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupRoleUpdatePermissionError"/>
- </check-permission>
- <check-errors/>
- <entity-one entity-name="SegmentGroupRole"
value-field="lookedUpValue"/>
- <set-pk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteSegmentGroupRole"
short-description="delete a SegmentGroupRole">
- <check-permission permission="MARKETING" action="_DELETE">
- <fail-property resource="MarketingUiLabels"
property="MarketingSegmentGroupRoleDeletePermissionError"/>
- </check-permission>
- <check-errors/>
- <entity-one entity-name="SegmentGroupRole"
value-field="lookedUpValue"/>
-<!-- <field-to-result field="lookedUpValue.partyId"
result-name="partyId"/> -->
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- SegmentGroup Related Find Service -->
<simple-method method-name="findPartiesInSegmentGroup"
short-description="Find Parties In a SegmentGroup">
<!--
Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1162496&r1=1162495&r2=1162496&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Sun Aug 28
11:12:57 2011
@@ -319,80 +319,79 @@ under the License.
</service>
<!-- SegmentGroup Services -->
- <service name="createSegmentGroup" default-entity-name="SegmentGroup"
engine="simple"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="createSegmentGroup" auth="true">
- <description>Create a SegmentGroup record</description>
+ <service name="createSegmentGroup" default-entity-name="SegmentGroup"
engine="entity-auto" invoke="create" auth="true">
+ <description>Create a SegmentGroup</description>
+ <permission-service service-name="marketingPermissionService"
main-action="CREATE"/>
<auto-attributes include="pk" mode="OUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateSegmentGroup" default-entity-name="SegmentGroup"
engine="simple"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="updateSegmentGroup" auth="true">
- <description>Update a SegmentGroup record</description>
+ <service name="updateSegmentGroup" default-entity-name="SegmentGroup"
engine="entity-auto" invoke="update" auth="true">
+ <description>Update a SegmentGroup</description>
+ <permission-service service-name="marketingPermissionService"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteSegmentGroup" default-entity-name="SegmentGroup"
engine="simple"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="deleteSegmentGroup" auth="true">
- <description>Update a SegmentGroup record</description>
+ <service name="deleteSegmentGroup" default-entity-name="SegmentGroup"
engine="entity-auto" invoke="delete" auth="true">
+ <description>Delete a SegmentGroup</description>
+ <permission-service service-name="marketingPermissionService"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- SegmentGroupClassification -->
- <service name="createSegmentGroupClassification" engine="simple"
default-entity-name="SegmentGroupClassification"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="createSegmentGroupClassification">
- <description>create SegmentGroupClassification</description>
+ <service name="createSegmentGroupClassification"
default-entity-name="SegmentGroupClassification" engine="entity-auto"
invoke="create" auth="true">
+ <description>Create a SegmentGroupClassification</description>
+ <permission-service service-name="marketingPermissionService"
main-action="CREATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="updateSegmentGroupClassification" engine="simple"
default-entity-name="SegmentGroupClassification"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="updateSegmentGroupClassification">
- <description>update SegmentGroupClassification</description>
+ <service name="updateSegmentGroupClassification"
default-entity-name="SegmentGroupClassification" engine="entity-auto"
invoke="update" auth="true">
+ <description>Update a SegmentGroupClassification</description>
+ <permission-service service-name="marketingPermissionService"
main-action="UPDATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="deleteSegmentGroupClassification" engine="simple"
default-entity-name="SegmentGroupClassification"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="deleteSegmentGroupClassification">
- <description>delete SegmentGroupClassification</description>
+ <service name="deleteSegmentGroupClassification"
default-entity-name="SegmentGroupClassification" engine="entity-auto"
invoke="delete" auth="true">
+ <description>Delete a SegmentGroupClassification</description>
+ <permission-service service-name="marketingPermissionService"
main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
</service>
<!-- SegmentGroupGeo -->
- <service name="createSegmentGroupGeo" engine="simple"
default-entity-name="SegmentGroupGeo"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="createSegmentGroupGeo">
- <description>create SegmentGroupGeo</description>
+ <service name="createSegmentGroupGeo"
default-entity-name="SegmentGroupGeo" engine="entity-auto" invoke="create"
auth="true">
+ <description>Create a SegmentGroupGeo</description>
+ <permission-service service-name="marketingPermissionService"
main-action="CREATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="updateSegmentGroupGeo" engine="simple"
default-entity-name="SegmentGroupGeo"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="updateSegmentGroupGeo">
- <description>update SegmentGroupGeo</description>
+ <service name="updateSegmentGroupGeo"
default-entity-name="SegmentGroupGeo" engine="entity-auto" invoke="update"
auth="true">
+ <description>Update a SegmentGroupGeo</description>
+ <permission-service service-name="marketingPermissionService"
main-action="UPDATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="deleteSegmentGroupGeo" engine="simple"
default-entity-name="SegmentGroupGeo"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="deleteSegmentGroupGeo">
- <description>delete SegmentGroupGeo</description>
+ <service name="deleteSegmentGroupGeo"
default-entity-name="SegmentGroupGeo" engine="entity-auto" invoke="delete"
auth="true">
+ <description>Delete a SegmentGroupGeo</description>
+ <permission-service service-name="marketingPermissionService"
main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
</service>
<!-- SegmentGroupRole -->
- <service name="createSegmentGroupRole" engine="simple"
default-entity-name="SegmentGroupRole"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="createSegmentGroupRole">
- <description>create SegmentGroupRole</description>
+ <service name="createSegmentGroupRole"
default-entity-name="SegmentGroupRole" engine="entity-auto" invoke="create"
auth="true">
+ <description>Create a SegmentGroupRole</description>
+ <permission-service service-name="marketingPermissionService"
main-action="CREATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="updateSegmentGroupRole" engine="simple"
default-entity-name="SegmentGroupRole"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="updateSegmentGroupRole">
- <description>update SegmentGroupRole</description>
+ <service name="updateSegmentGroupRole"
default-entity-name="SegmentGroupRole" engine="entity-auto" invoke="update"
auth="true">
+ <description>Update a SegmentGroupRole</description>
+ <permission-service service-name="marketingPermissionService"
main-action="UPDATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="deleteSegmentGroupRole" engine="simple"
default-entity-name="SegmentGroupRole"
-
location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml"
invoke="deleteSegmentGroupRole">
- <description>delete SegmentGroupRole</description>
+ <service name="deleteSegmentGroupRole"
default-entity-name="SegmentGroupRole" engine="entity-auto" invoke="delete"
auth="true">
+ <description>Delete a SegmentGroupRole</description>
+ <permission-service service-name="marketingPermissionService"
main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
-<!-- <attribute name="partyId" mode="OUT"
optional="false"></attribute> -->
</service>
<!-- SegmentGroup Related Find Service -->