From efbd99c9ae96fb6656ba9d03742917aacd2b5e69 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 17 Jul 2008 07:11:25 +0000 Subject: [PATCH] Don't rely on Java verifier when checking for JavaMail in mail task. PR 31969. Submitted by Kev Jackson. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@677516 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java index 26f7fde74..0a5c70ca1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -417,10 +417,16 @@ public class EmailTask extends Task { if (encoding.equals(MIME) || (encoding.equals(AUTO) && !autoFound)) { try { + //check to make sure that activation.jar + //and mail.jar are available - see bug 31969 + Class.forName("javax.activation.DataHandler"); + Class.forName("javax.mail.internet.MimeMessage"); + mailer = (Mailer) ClasspathUtils.newInstance( "org.apache.tools.ant.taskdefs.email.MimeMailer", EmailTask.class.getClassLoader(), Mailer.class); autoFound = true; + log("Using MIME mail", Project.MSG_VERBOSE); } catch (BuildException e) { logBuildException("Failed to initialise MIME mail: ", e);