Replaced deprecared service call with suggested service (OFBIZ-13272)
diff --git a/ecommerce/widget/CommonScreens.xml b/ecommerce/widget/CommonScreens.xml
index 73f1c65..e8c2a01 100644
--- a/ecommerce/widget/CommonScreens.xml
+++ b/ecommerce/widget/CommonScreens.xml
@@ -384,7 +384,7 @@
     <screen name="responseTreeLine">
         <section>
             <actions>
-                <service service-name="getPublicForumMessage" result-map="contentData">
+                <service service-name="getContentAndDataResource" result-map="contentData">
                     <field-map field-name="contentId" from-field="rsp.contentId"/>
                 </service>
                 <set field="textData" from-field="contentData.resultData.electronicText.textData"/>
diff --git a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
index 1858c7d..5123cb3 100644
--- a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
+++ b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
@@ -191,7 +191,7 @@
     </request-map>
     <request-map uri="deleteTaskPartyAssign">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deletePartyToWorkEffortAssignment"/>
+        <event type="service" invoke="expireWorkEffortPartyAssignment"/>
         <response name="success" type="view" value="EditTaskPartyAssigns"/>
         <response name="error" type="view" value="EditTaskPartyAssigns"/>
     </request-map>
@@ -574,7 +574,7 @@
     </request-map>
     <request-map uri="deleteWorkEffortPartyAssign">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deletePartyToWorkEffortAssignment"/>
+        <event type="service" invoke="expireWorkEffortPartyAssignment"/>
         <response name="success" type="view" value="ListWorkEffortPartyAssigns"/>
         <response name="error" type="view" value="ListWorkEffortPartyAssigns"/>
     </request-map>
diff --git a/scrum/webapp/scrum/WEB-INF/controller.xml b/scrum/webapp/scrum/WEB-INF/controller.xml
index 550bc0a..330aae4 100644
--- a/scrum/webapp/scrum/WEB-INF/controller.xml
+++ b/scrum/webapp/scrum/WEB-INF/controller.xml
@@ -374,7 +374,7 @@
     </request-map>
     <request-map uri="removeTaskMember">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deletePartyToWorkEffortAssignment"/>
+        <event type="service" invoke="expireWorkEffortPartyAssignment"/>
         <response name="error" type="request" value="SprintTaskView"/>
         <response name="success" type="request" value="SprintTaskView"/>
     </request-map>
@@ -500,7 +500,7 @@
     </request-map>
     <request-map uri="deleteTaskPartyAssign">
         <security https="true" auth="true"/>
-        <event type="service" invoke="deletePartyToWorkEffortAssignment"/>
+        <event type="service" invoke="expireWorkEffortPartyAssignment"/>
         <response name="success" type="view" value="EditTaskPartyAssigns"/>
         <response name="error" type="view" value="EditTaskPartyAssigns"/>
     </request-map>