Browse Source

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
master
Stefan Bodewig 17 years ago
parent
commit
efbd99c9ae
1 changed files with 6 additions and 0 deletions
  1. +6
    -0
      src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java

+ 6
- 0
src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java View File

@@ -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);


Loading…
Cancel
Save