svn commit: r1300774 - in /incubator/oozie/trunk: core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java release-log.txt

[tu...@apache.org]

Author: tucu
Date: Wed Mar 14 22:57:14 2012
New Revision: 1300774

URL: http://svn.apache.org/viewvc?rev=1300774&view=rev
Log:
OOZIE-759. Fix config defaults in EmailActionExecutor (harsh via tucu)

Modified:
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java
    incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java?rev=1300774&r1=1300773&r2=1300774&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java Wed Mar 14 22:57:14 2012
@@ -112,12 +112,14 @@ public class EmailActionExecutor extends
 
     protected void email(Context context, String[] to, String[] cc, String subject, String body) throws ActionExecutorException {
         // Get mailing server details.
-        String smtpHost = getOozieConf().get("oozie.email.smtp.host");
+        String smtpHost = getOozieConf().get("oozie.email.smtp.host",
+            "localhost");
         String smtpPort = getOozieConf().get("oozie.email.smtp.port", "25");
         Boolean smtpAuth = getOozieConf().getBoolean("oozie.email.smtp.auth", false);
         String smtpUser = getOozieConf().get("oozie.email.smtp.username", "");
         String smtpPassword = getOozieConf().get("oozie.email.smtp.password", "");
-        String fromAddr = getOozieConf().get("oozie.email.from.address");
+        String fromAddr = getOozieConf().get("oozie.email.from.address",
+            "oozie@localhost");
 
         Properties properties = new Properties();
         properties.setProperty("mail.smtp.host", smtpHost);

Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java?rev=1300774&r1=1300773&r2=1300774&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java Wed Mar 14 22:57:14 2012
@@ -52,8 +52,11 @@ public class TestEmailActionExecutor ext
         EmailActionExecutor ae = new EmailActionExecutor();
 
         Services.get().getConf().setInt("oozie.email.smtp.port", server.getSmtp().getPort());
-        Services.get().getConf().set("oozie.email.smtp.host", "localhost");
-        Services.get().getConf().set("oozie.email.from.address", "test@oozie.com");
+        // Use default host 'localhost'. Hence, do not set the smtp host.
+        // Services.get().getConf().set("oozie.email.smtp.host", "localhost");
+        // Use default from address, 'oozie@localhost'.
+        // Hence, do not set the from address conf.
+        // Services.get().getConf().set("oozie.email.from.address", "oozie@localhost");
 
         // Disable auth tests by default.
         Services.get().getConf().setBoolean("oozie.email.smtp.auth", false);
@@ -77,7 +80,7 @@ public class TestEmailActionExecutor ext
 
         // Override and enable auth.
         Services.get().getConf().setBoolean("oozie.email.smtp.auth", true);
-        Services.get().getConf().set("oozie.email.smtp.username", "test@oozie.com");
+        Services.get().getConf().set("oozie.email.smtp.username", "oozie@localhost");
         Services.get().getConf().set("oozie.email.smtp.password", "oozie");
         return ctx;
     }

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1300774&r1=1300773&r2=1300774&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Wed Mar 14 22:57:14 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.2.0 release
 
+OOZIE-759. Fix config defaults in EmailActionExecutor (harsh via tucu)
 OOZIE-675 checkMultipleTimeInstances doesn't work for EL extensions. EX: ${coord:formatTime(coord:current(0),'yyyy-MM-dd')} (sriksun via tucu)
 OOZIE-749 oozie tests doesn't delete the files in tmp directories (virag via tucu)
 OOZIE-761 Fixes in CoordELFunctions and testcases for Hadoop 0.23 (tucu)