azkaban-aplcache

diff --git a/src/java/azkaban/utils/Mailman.java b/src/java/azkaban/utils/Mailman.java
index 094ad55..2553a21 100644
--- a/src/java/azkaban/utils/Mailman.java
+++ b/src/java/azkaban/utils/Mailman.java
@@ -26,10 +26,6 @@ import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
-
-import org.apache.commons.mail.EmailException;
-import org.apache.commons.mail.SimpleEmail;
-
 import org.apache.log4j.Logger;
 
 import com.sun.mail.smtp.SMTPTransport;
@@ -59,9 +55,6 @@ public class Mailman {
 
 	public void sendEmail(String fromAddress, List<String> toAddress,
 			String subject, String body) throws MessagingException {
-<<<<<<< HEAD
-=======
-
 		//session
 		Properties props = new Properties();
 		props.put("mail." + protocol + ".host", _mailHost);
@@ -93,31 +86,6 @@ public class Mailman {
 		finally {
 			t.close();
 		}
-		
-		
-		
->>>>>>> 7f1fd5f465d15e01aae522eceac6fc7863031bcb
-//		SimpleEmail email = new SimpleEmail();
-//
-//		try {
-//			email.setHostName(_mailHost);
-//
-//			for (String addr : toAddress) {
-//				email.addTo(addr);
-//			}
-//
-//			email.setFrom(fromAddress);
-//			email.setSubject(subject);
-//
-//			email.setMsg(body);
-//			email.setDebug(true);
-//			email.send();
-//		} catch (EmailException e) {
-//			logger.error(e);
-//		} catch (Exception e) {
-//			logger.error(e);
-//		}
-
 	}
 
 	public void sendEmailIfPossible(String fromAddress, List<String> toAddress,

diff --git a/src/java/azkaban/utils/Mailman.java.orig b/src/java/azkaban/utils/Mailman.java.orig
new file mode 100644
index 0000000..094ad55
--- /dev/null
+++ b/src/java/azkaban/utils/Mailman.java.orig
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2010 LinkedIn, Inc
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package azkaban.utils;
+
+import java.util.List;
+import java.util.Properties;
+
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
+
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.SimpleEmail;
+
+import org.apache.log4j.Logger;
+
+import com.sun.mail.smtp.SMTPTransport;
+
+/**
+ * The mailman send you mail, if you ask him
+ * 
+ */
+public class Mailman {
+
+	private static Logger logger = Logger.getLogger(Mailman.class.getName());
+
+	private final String _mailHost;
+	private final String _mailUser;
+	private final String _mailPassword;
+	private final String _mailSender;
+	
+	private final String protocol = "smtp";
+
+	public Mailman(String mailHost, String mailUser, String mailPassword,
+			String mailSender) {
+		this._mailHost = mailHost;
+		this._mailUser = mailUser;
+		this._mailPassword = mailPassword;
+		this._mailSender = mailSender;
+	}
+
+	public void sendEmail(String fromAddress, List<String> toAddress,
+			String subject, String body) throws MessagingException {
+<<<<<<< HEAD
+=======
+
+		//session
+		Properties props = new Properties();
+		props.put("mail." + protocol + ".host", _mailHost);
+		props.put("mail." + protocol + ".auth", "true");
+		
+		Session session = Session.getInstance(props, null);
+		session.setDebug(true);
+		
+		//email message
+		Message msg = new MimeMessage(session);
+		msg.setFrom(new InternetAddress(fromAddress));
+		for(String str : toAddress) {
+			msg.addRecipients(Message.RecipientType.TO, InternetAddress.parse(str));
+		}
+		
+		msg.setSubject(subject);
+		msg.setText(body);
+		
+		//transport
+		SMTPTransport t = (SMTPTransport)session.getTransport(protocol);
+		
+		try {
+			t.connect(_mailHost, _mailUser, _mailPassword);
+			t.sendMessage(msg, msg.getAllRecipients());
+		}
+		catch (Exception e) {
+			logger.error(e);
+		}
+		finally {
+			t.close();
+		}
+		
+		
+		
+>>>>>>> 7f1fd5f465d15e01aae522eceac6fc7863031bcb
+//		SimpleEmail email = new SimpleEmail();
+//
+//		try {
+//			email.setHostName(_mailHost);
+//
+//			for (String addr : toAddress) {
+//				email.addTo(addr);
+//			}
+//
+//			email.setFrom(fromAddress);
+//			email.setSubject(subject);
+//
+//			email.setMsg(body);
+//			email.setDebug(true);
+//			email.send();
+//		} catch (EmailException e) {
+//			logger.error(e);
+//		} catch (Exception e) {
+//			logger.error(e);
+//		}
+
+	}
+
+	public void sendEmailIfPossible(String fromAddress, List<String> toAddress,
+			String subject, String body) {
+		try {
+			sendEmail(fromAddress, toAddress, subject, body);
+		} catch (AddressException e) {
+			logger.warn("Error while sending email, invalid email: "
+					+ e.getMessage());
+		} catch (MessagingException e) {
+			logger.warn("Error while sending email: " + e.getMessage());
+		}
+	}
+
+}