svn commit: r1162498 - in /ofbiz/trunk/applications/marketing: config/MarketingUiLabels.xml script/org/ofbiz/marketing/segment/SegmentServices.xml servicedef/services.xml

[adrianc]

Author: adrianc
Date: Sun Aug 28 11:29:18 2011
New Revision: 1162498

URL: http://svn.apache.org/viewvc?rev=1162498&view=rev
Log:
Removed empty (and apparently unused) Marketing Segment find services.

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=1162498&r1=1162497&r2=1162498&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sun Aug 28 11:29:18 2011
@@ -892,10 +892,6 @@
         <value xml:lang="zh">分区组会员的分类组标识</value>
         <value xml:lang="zh_TW">分區組成員的分類組ID</value>
     </property>
-    <property key="MarketingSegmentGroupPermissionError">
-        <value xml:lang="en">Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission</value>
-        <value xml:lang="it">Errore di sicurezza\: per eseguire ${methodShortDescription} devi avere il permesso MARKETING${securityAction} o MARKETING_ADMIN</value>
-    </property>
     <property key="MarketingSegmentGroupProductStoreId">
         <value xml:lang="de">Produktgeschäfts-ID</value>
         <value xml:lang="en">Product Store Id</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=1162498&r1=1162497&r2=1162498&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:29:18 2011
@@ -22,29 +22,6 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
 
     <!-- SegmentGroup Related Find Service -->
-    <simple-method method-name="findPartiesInSegmentGroup" short-description="Find Parties In a SegmentGroup">
-        <!--
-            Determined by:
-            SegmentGroup -> SegmentGroupRole -> Party
-            OR
-            SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party
-         -->
-        <set field="securityAction" value="_VIEW"/>
-        <check-permission permission="MARKETING" action="${securityAction}">
-            <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-    </simple-method>
-    <simple-method method-name="findSegmentGroupsOfParty" short-description="Find SegmentGroups Of a Party (that a Party is In)">
-        <!-- Follows same path as findPartiesInSegmentGroup, but in reverse... -->
-        <set field="securityAction" value="_VIEW"/>
-        <check-permission permission="MARKETING" action="${securityAction}">
-            <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-    </simple-method>
     <simple-method method-name="arePartiesRelatedThroughSegmentGroup" short-description="Determine: are Parties Related Through SegmentGroup?">
         <!-- NOTE NOTE NOTE: this service is not current and needs to be updated for the new SegmentGroupViewRelatedParties view-entity def -->
 
@@ -55,12 +32,6 @@ under the License.
             OR
             Party -> SegmentGroupRole -> SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party
         -->
-        <set field="securityAction" value="_VIEW"/>
-        <check-permission permission="MARKETING" action="${securityAction}">
-            <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/>
-        </check-permission>
-        <check-errors/>
-
         <now-timestamp field="nowTimestamp"/>
         <entity-condition entity-name="SegmentGroupViewRelatedParties" list="segmentGroupViewRelatedPartiesList">
             <condition-list combine="and">

Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1162498&r1=1162497&r2=1162498&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Sun Aug 28 11:29:18 2011
@@ -395,23 +395,10 @@ under the License.
     </service>
 
     <!-- SegmentGroup Related Find Service -->
-    <service name="findPartiesInSegmentGroup" engine="simple"
-        location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml" invoke="findPartiesInSegmentGroup">
-        <description>Find Parties In a SegmentGroup</description>
-        <attribute name="segmentGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="roleTypeId" type="String" mode="IN" optional="true"/>
-        <attribute name="partyIdList" type="List" mode="OUT" optional="true"/>
-    </service>
-    <service name="findSegmentGroupsOfParty" engine="simple"
-        location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml" invoke="findSegmentGroupsOfParty">
-        <description>Find SegmentGroups Of a Party (that a Party is In)</description>
-        <attribute name="partyId" type="String" mode="IN" optional="false"/>
-        <attribute name="roleTypeId" type="String" mode="IN" optional="true"/>
-        <attribute name="segmentGroupIdList" type="List" mode="OUT" optional="true"/>
-    </service>
     <service name="arePartiesRelatedThroughSegmentGroup" engine="simple"
         location="component://marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml" invoke="arePartiesRelatedThroughSegmentGroup">
         <description>Determine: are Parties Related Through SegmentGroup?</description>
+        <permission-service service-name="marketingPermissionService" main-action="VIEW"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="roleTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="toPartyId" type="String" mode="IN" optional="false"/>