svn commit: r1064953 - in /ofbiz/trunk/framework/common: script/org/ofbiz/common/email/EmailServices.xml src/org/ofbiz/common/email/EmailServices.java

[ashish-18]

Author: ashish
Date: Sat Jan 29 05:29:55 2011
New Revision: 1064953

URL: http://svn.apache.org/viewvc?rev=1064953&view=rev
Log:
Bug fix. Returning communicationEventId from the service implementation which was defined OUT in service definition. Thanks Divesh!

Modified:
    ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
    ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=1064953&r1=1064952&r2=1064953&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Sat Jan 29 05:29:55 2011
@@ -69,6 +69,7 @@ under the License.
             <call-service service-name="sendMailFromScreen" in-map-name="emailParams">
                 <result-to-result result-name="messageWrapper"/>
                 <result-to-result result-name="body"/>
+                <result-to-result result-name="communicationEventId"/>
             </call-service>
             <else>
                 <log level="error" message="sendMailFromTemplateSetting service could not find the emailTemplateSettingId: ${parameters.emailTemplateSettingId}"></log>

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1064953&r1=1064952&r2=1064953&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java Sat Jan 29 05:29:55 2011
@@ -611,6 +611,7 @@ public class EmailServices {
         result.put("messageWrapper", sendMailResult.get("messageWrapper"));
         result.put("body", bodyWriter.toString());
         result.put("subject", subject);
+        result.put("communicationEventId", sendMailResult.get("communicationEventId"));
         if (UtilValidate.isNotEmpty(orderId)) {
             result.put("orderId", orderId);
         }