svn commit: r1627776 - in /ofbiz/trunk/applications/content/script/org/ofbiz/content: compdoc/CompDocServices.xml content/ContentServices.xml

[jacopoc]

Author: jacopoc
Date: Fri Sep 26 13:12:07 2014
New Revision: 1627776

URL: http://svn.apache.org/r1627776
Log:
Some simplifications to the code introduced with my last commit: this will also simplify the backporting to release branches.

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.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=1627776&r1=1627775&r2=1627776&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 Fri Sep 26 13:12:07 2014
@@ -197,17 +197,16 @@ under the License.
             <results-to-map map-name="pResults"/>
         </call-service>
         <!--  put all the result fields in this service's result -->
-        <set-service-fields service-name="persistCompDoc" mode="OUT" map="pResults" to-map="filteredPersistOut"/>
-        <field-to-result field="filteredPersistOut.contentRevisionSeqId" result-name="contentRevisionSeqId"/>
-        <field-to-result field="filteredPersistOut.contentId" result-name="contentId"/>
-        <field-to-result field="filteredPersistOut.dataResourceId" result-name="dataResourceId"/>
-        <field-to-result field="filteredPersistOut.drDataResourceId" result-name="drDataResourceId"/>
-        <field-to-result field="filteredPersistOut.caContentIdTo" result-name="caContentIdTo"/>
-        <field-to-result field="filteredPersistOut.caContentId" result-name="caContentId"/>
-        <field-to-result field="filteredPersistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
-        <field-to-result field="filteredPersistOut.caFromDate" result-name="caFromDate"/>
-        <field-to-result field="filteredPersistOut.caSequenceNum" result-name="caSequenceNum"/>
-        <field-to-result field="filteredPersistOut.roleTypeList" result-name="roleTypeList"/>
+        <field-to-result field="pResults.contentRevisionSeqId" result-name="contentRevisionSeqId"/>
+        <field-to-result field="pResults.contentId" result-name="contentId"/>
+        <field-to-result field="pResults.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="pResults.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="pResults.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="pResults.caContentId" result-name="caContentId"/>
+        <field-to-result field="pResults.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="pResults.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="pResults.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="pResults.roleTypeList" result-name="roleTypeList"/>
 
         <log level="info" message="pResults : ${pResults}"/>
         <if-not-empty field="pResults.contentIdTo">

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1627776&r1=1627775&r2=1627776&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Fri Sep 26 13:12:07 2014
@@ -779,17 +779,16 @@
             <results-to-map map-name="persistOut"/>
         </call-service>
 
-        <set-service-fields service-name="createCommContentDataResource" mode="OUT" map="persistOut" to-map="filteredPersistOut"/>
-        <field-to-result field="filteredPersistOut.contentId" result-name="contentId"/>
-        <field-to-result field="filteredPersistOut.dataResourceId" result-name="dataResourceId"/>
-        <field-to-result field="filteredPersistOut.drDataResourceId" result-name="drDataResourceId"/>
-        <field-to-result field="filteredPersistOut.caContentIdTo" result-name="caContentIdTo"/>
-        <field-to-result field="filteredPersistOut.caContentId" result-name="caContentId"/>
-        <field-to-result field="filteredPersistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
-        <field-to-result field="filteredPersistOut.caFromDate" result-name="caFromDate"/>
-        <field-to-result field="filteredPersistOut.caSequenceNum" result-name="caSequenceNum"/>
-        <field-to-result field="filteredPersistOut.roleTypeList" result-name="roleTypeList"/>
-        <field-to-result field="filteredPersistOut.fromDate" result-name="fromDate"/>
+        <field-to-result field="persistOut.contentId" result-name="contentId"/>
+        <field-to-result field="persistOut.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="persistOut.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="persistOut.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="persistOut.caContentId" result-name="caContentId"/>
+        <field-to-result field="persistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="persistOut.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="persistOut.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="persistOut.roleTypeList" result-name="roleTypeList"/>
+        <field-to-result field="persistOut.fromDate" result-name="fromDate"/>
 
         <set field="mapIn.contentId"  from-field="persistOut.contentId"/>
         <set field="mapIn.communicationEventId"  from-field="parameters.communicationEventId"/>
@@ -824,16 +823,15 @@
         <call-service service-name="updateCommEventContentAssoc" in-map-name="mapIn">
         </call-service>
 
-        <set-service-fields service-name="updateCommContentDataResource" mode="OUT" map="persistOut" to-map="filteredPersistOut"/>
-        <field-to-result field="filteredPersistOut.contentId" result-name="contentId"/>
-        <field-to-result field="filteredPersistOut.dataResourceId" result-name="dataResourceId"/>
-        <field-to-result field="filteredPersistOut.drDataResourceId" result-name="drDataResourceId"/>
-        <field-to-result field="filteredPersistOut.caContentIdTo" result-name="caContentIdTo"/>
-        <field-to-result field="filteredPersistOut.caContentId" result-name="caContentId"/>
-        <field-to-result field="filteredPersistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
-        <field-to-result field="filteredPersistOut.caFromDate" result-name="caFromDate"/>
-        <field-to-result field="filteredPersistOut.caSequenceNum" result-name="caSequenceNum"/>
-        <field-to-result field="filteredPersistOut.roleTypeList" result-name="roleTypeList"/>
+        <field-to-result field="persistOut.contentId" result-name="contentId"/>
+        <field-to-result field="persistOut.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="persistOut.drDataResourceId" result-name="drDataResourceId"/>
+        <field-to-result field="persistOut.caContentIdTo" result-name="caContentIdTo"/>
+        <field-to-result field="persistOut.caContentId" result-name="caContentId"/>
+        <field-to-result field="persistOut.caContentAssocTypeId" result-name="caContentAssocTypeId"/>
+        <field-to-result field="persistOut.caFromDate" result-name="caFromDate"/>
+        <field-to-result field="persistOut.caSequenceNum" result-name="caSequenceNum"/>
+        <field-to-result field="persistOut.roleTypeList" result-name="roleTypeList"/>
 
     </simple-method>