From 99cd629a665f19980010c3d8225939dbc39b5f57 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 22 Sep 2009 17:45:56 +0000 Subject: [PATCH] modernized the layout. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22001 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/tasks/Mailer.java | 28 +++++++++---- .../hudson/tasks/Mailer/global.jelly | 42 ++++++++----------- .../tasks/Mailer/help-adminAddress.html | 0 .../tasks/Mailer/help-adminAddress_de.html | 0 .../tasks/Mailer/help-adminAddress_fr.html | 0 .../tasks/Mailer/help-adminAddress_ja.html | 0 .../tasks/Mailer/help-adminAddress_nl.html | 0 .../tasks/Mailer/help-adminAddress_pt_BR.html | 0 .../tasks/Mailer/help-adminAddress_ru.html | 0 .../tasks/Mailer/help-adminAddress_tr.html | 0 .../tasks/Mailer/help-defaultSuffix.html | 0 .../tasks/Mailer/help-defaultSuffix_de.html | 0 .../tasks/Mailer/help-defaultSuffix_fr.html | 0 .../tasks/Mailer/help-defaultSuffix_ja.html | 0 .../tasks/Mailer/help-defaultSuffix_nl.html | 0 .../Mailer/help-defaultSuffix_pt_BR.html | 0 .../tasks/Mailer/help-defaultSuffix_ru.html | 0 .../tasks/Mailer/help-defaultSuffix_tr.html | 0 .../hudson/tasks/Mailer/help-smtpPort.html | 0 .../hudson/tasks/Mailer/help-smtpPort_de.html | 0 .../hudson/tasks/Mailer/help-smtpPort_fr.html | 0 .../hudson/tasks/Mailer/help-smtpPort_ja.html | 0 .../hudson/tasks/Mailer/help-smtpPort_nl.html | 0 .../hudson/tasks/Mailer/help-smtpPort_tr.html | 0 .../hudson/tasks/Mailer/help-smtpServer.html | 0 .../tasks/Mailer/help-smtpServer_de.html | 0 .../tasks/Mailer/help-smtpServer_fr.html | 0 .../tasks/Mailer/help-smtpServer_ja.html | 0 .../tasks/Mailer/help-smtpServer_nl.html | 0 .../tasks/Mailer/help-smtpServer_pt_BR.html | 0 .../tasks/Mailer/help-smtpServer_ru.html | 0 .../tasks/Mailer/help-smtpServer_tr.html | 0 .../hudson/tasks/Mailer/help-url.html | 0 .../hudson/tasks/Mailer/help-url_de.html | 0 .../hudson/tasks/Mailer/help-url_fr.html | 0 .../hudson/tasks/Mailer/help-url_ja.html | 0 .../hudson/tasks/Mailer/help-url_nl.html | 0 .../hudson/tasks/Mailer/help-url_pt_BR.html | 0 .../hudson/tasks/Mailer/help-url_ru.html | 0 .../hudson/tasks/Mailer/help-url_tr.html | 0 .../hudson/tasks/Mailer/help-useSsl.html | 0 .../hudson/tasks/Mailer/help-useSsl_de.html | 0 .../hudson/tasks/Mailer/help-useSsl_fr.html | 0 .../hudson/tasks/Mailer/help-useSsl_ja.html | 0 .../hudson/tasks/Mailer/help-useSsl_nl.html | 0 .../tasks/Mailer/help-useSsl_pt_BR.html | 0 .../hudson/tasks/Mailer/help-useSsl_ru.html | 0 .../hudson/tasks/Mailer/help-useSsl_tr.html | 0 .../test/java/hudson/tasks/MailerTest.java | 27 ++++++++++++ 49 files changed, 63 insertions(+), 34 deletions(-) rename war/resources/help/tasks/mailer/admin-address.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress.html (100%) rename war/resources/help/tasks/mailer/admin-address_de.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_de.html (100%) rename war/resources/help/tasks/mailer/admin-address_fr.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_fr.html (100%) rename war/resources/help/tasks/mailer/admin-address_ja.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ja.html (100%) rename war/resources/help/tasks/mailer/admin-address_nl.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_nl.html (100%) rename war/resources/help/tasks/mailer/admin-address_pt_BR.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_pt_BR.html (100%) rename war/resources/help/tasks/mailer/admin-address_ru.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ru.html (100%) rename war/resources/help/tasks/mailer/admin-address_tr.html => core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_tr.html (100%) rename war/resources/help/tasks/mailer/default-suffix.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix.html (100%) rename war/resources/help/tasks/mailer/default-suffix_de.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_de.html (100%) rename war/resources/help/tasks/mailer/default-suffix_fr.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_fr.html (100%) rename war/resources/help/tasks/mailer/default-suffix_ja.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ja.html (100%) rename war/resources/help/tasks/mailer/default-suffix_nl.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_nl.html (100%) rename war/resources/help/tasks/mailer/default-suffix_pt_BR.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_pt_BR.html (100%) rename war/resources/help/tasks/mailer/default-suffix_ru.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ru.html (100%) rename war/resources/help/tasks/mailer/default-suffix_tr.html => core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_tr.html (100%) rename war/resources/help/tasks/mailer/smtp-port.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpPort.html (100%) rename war/resources/help/tasks/mailer/smtp-port_de.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_de.html (100%) rename war/resources/help/tasks/mailer/smtp-port_fr.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_fr.html (100%) rename war/resources/help/tasks/mailer/smtp-port_ja.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_ja.html (100%) rename war/resources/help/tasks/mailer/smtp-port_nl.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_nl.html (100%) rename war/resources/help/tasks/mailer/smtp-port_tr.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_tr.html (100%) rename war/resources/help/tasks/mailer/smtp-server.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer.html (100%) rename war/resources/help/tasks/mailer/smtp-server_de.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_de.html (100%) rename war/resources/help/tasks/mailer/smtp-server_fr.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_fr.html (100%) rename war/resources/help/tasks/mailer/smtp-server_ja.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ja.html (100%) rename war/resources/help/tasks/mailer/smtp-server_nl.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_nl.html (100%) rename war/resources/help/tasks/mailer/smtp-server_pt_BR.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_pt_BR.html (100%) rename war/resources/help/tasks/mailer/smtp-server_ru.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ru.html (100%) rename war/resources/help/tasks/mailer/smtp-server_tr.html => core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_tr.html (100%) rename war/resources/help/tasks/mailer/url.html => core/src/main/resources/hudson/tasks/Mailer/help-url.html (100%) rename war/resources/help/tasks/mailer/url_de.html => core/src/main/resources/hudson/tasks/Mailer/help-url_de.html (100%) rename war/resources/help/tasks/mailer/url_fr.html => core/src/main/resources/hudson/tasks/Mailer/help-url_fr.html (100%) rename war/resources/help/tasks/mailer/url_ja.html => core/src/main/resources/hudson/tasks/Mailer/help-url_ja.html (100%) rename war/resources/help/tasks/mailer/url_nl.html => core/src/main/resources/hudson/tasks/Mailer/help-url_nl.html (100%) rename war/resources/help/tasks/mailer/url_pt_BR.html => core/src/main/resources/hudson/tasks/Mailer/help-url_pt_BR.html (100%) rename war/resources/help/tasks/mailer/url_ru.html => core/src/main/resources/hudson/tasks/Mailer/help-url_ru.html (100%) rename war/resources/help/tasks/mailer/url_tr.html => core/src/main/resources/hudson/tasks/Mailer/help-url_tr.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl_de.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl_de.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl_fr.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl_fr.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl_ja.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ja.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl_nl.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl_nl.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl_pt_BR.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl_pt_BR.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl_ru.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ru.html (100%) rename war/resources/help/tasks/mailer/smtp-use-ssl_tr.html => core/src/main/resources/hudson/tasks/Mailer/help-useSsl_tr.html (100%) diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index f72a03a25b..242c74b5a4 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -262,23 +262,24 @@ public class Mailer extends Notifier { @Override public boolean configure(StaplerRequest req, JSONObject json) throws FormException { // this code is brain dead - smtpHost = nullify(req.getParameter("mailer_smtp_server")); - setAdminAddress(req.getParameter("mailer_admin_address")); + smtpHost = nullify(json.getString("smtpServer")); + setAdminAddress(json.getString("adminAddress")); - defaultSuffix = nullify(req.getParameter("mailer_default_suffix")); + defaultSuffix = nullify(json.getString("defaultSuffix")); String url = nullify(json.getString("url")); if(url!=null && !url.endsWith("/")) url += '/'; hudsonUrl = url; - if(req.getParameter("mailer.useSMTPAuth")!=null) { - smtpAuthUsername = nullify(req.getParameter("mailer.SMTPAuth.userName")); - smtpAuthPassword = nullify(req.getParameter("mailer.SMTPAuth.password")); + if(json.has("useSMTPAuth")) { + JSONObject auth = json.getJSONObject("useSMTPAuth"); + smtpAuthUsername = nullify(auth.getString("smtpAuthUserName")); + smtpAuthPassword = nullify(auth.getString("smtpAuthPassword")); } else { smtpAuthUsername = smtpAuthPassword = null; } - smtpPort = nullify(req.getParameter("mailer_smtp_port")); - useSsl = req.getParameter("mailer_smtp_use_ssl")!=null; + smtpPort = nullify(json.getString("smtpPort")); + useSsl = json.getBoolean("useSsl"); save(); return true; } @@ -347,6 +348,11 @@ public class Mailer extends Notifier { this.smtpPort = smtpPort; } + public void setSmtpAuth(String userName, String password) { + this.smtpAuthUsername = userName; + this.smtpAuthPassword = password; + } + @Override public Publisher newInstance(StaplerRequest req) { Mailer m = new Mailer(); @@ -379,7 +385,11 @@ public class Mailer extends Notifier { return FormValidation.error(e.getMessage()); } } - + + public FormValidation doCheckAdminAddress(@QueryParameter String value) { + return doAddressCheck(value); + } + /** * Send an email to the admin address * @param rsp used to write the result of the sending diff --git a/core/src/main/resources/hudson/tasks/Mailer/global.jelly b/core/src/main/resources/hudson/tasks/Mailer/global.jelly index e01c975640..1e702a28ae 100644 --- a/core/src/main/resources/hudson/tasks/Mailer/global.jelly +++ b/core/src/main/resources/hudson/tasks/Mailer/global.jelly @@ -31,41 +31,33 @@ THE SOFTWARE. - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + diff --git a/war/resources/help/tasks/mailer/admin-address.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress.html diff --git a/war/resources/help/tasks/mailer/admin-address_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_de.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address_de.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_de.html diff --git a/war/resources/help/tasks/mailer/admin-address_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_fr.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address_fr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_fr.html diff --git a/war/resources/help/tasks/mailer/admin-address_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ja.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address_ja.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ja.html diff --git a/war/resources/help/tasks/mailer/admin-address_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_nl.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address_nl.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_nl.html diff --git a/war/resources/help/tasks/mailer/admin-address_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_pt_BR.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address_pt_BR.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_pt_BR.html diff --git a/war/resources/help/tasks/mailer/admin-address_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ru.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address_ru.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ru.html diff --git a/war/resources/help/tasks/mailer/admin-address_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_tr.html similarity index 100% rename from war/resources/help/tasks/mailer/admin-address_tr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_tr.html diff --git a/war/resources/help/tasks/mailer/default-suffix.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix.html diff --git a/war/resources/help/tasks/mailer/default-suffix_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_de.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix_de.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_de.html diff --git a/war/resources/help/tasks/mailer/default-suffix_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_fr.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix_fr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_fr.html diff --git a/war/resources/help/tasks/mailer/default-suffix_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ja.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix_ja.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ja.html diff --git a/war/resources/help/tasks/mailer/default-suffix_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_nl.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix_nl.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_nl.html diff --git a/war/resources/help/tasks/mailer/default-suffix_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_pt_BR.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix_pt_BR.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_pt_BR.html diff --git a/war/resources/help/tasks/mailer/default-suffix_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ru.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix_ru.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ru.html diff --git a/war/resources/help/tasks/mailer/default-suffix_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_tr.html similarity index 100% rename from war/resources/help/tasks/mailer/default-suffix_tr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_tr.html diff --git a/war/resources/help/tasks/mailer/smtp-port.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-port.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpPort.html diff --git a/war/resources/help/tasks/mailer/smtp-port_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_de.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-port_de.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_de.html diff --git a/war/resources/help/tasks/mailer/smtp-port_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_fr.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-port_fr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_fr.html diff --git a/war/resources/help/tasks/mailer/smtp-port_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_ja.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-port_ja.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_ja.html diff --git a/war/resources/help/tasks/mailer/smtp-port_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_nl.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-port_nl.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_nl.html diff --git a/war/resources/help/tasks/mailer/smtp-port_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_tr.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-port_tr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_tr.html diff --git a/war/resources/help/tasks/mailer/smtp-server.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer.html diff --git a/war/resources/help/tasks/mailer/smtp-server_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_de.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server_de.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_de.html diff --git a/war/resources/help/tasks/mailer/smtp-server_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_fr.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server_fr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_fr.html diff --git a/war/resources/help/tasks/mailer/smtp-server_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ja.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server_ja.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ja.html diff --git a/war/resources/help/tasks/mailer/smtp-server_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_nl.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server_nl.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_nl.html diff --git a/war/resources/help/tasks/mailer/smtp-server_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_pt_BR.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server_pt_BR.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_pt_BR.html diff --git a/war/resources/help/tasks/mailer/smtp-server_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ru.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server_ru.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ru.html diff --git a/war/resources/help/tasks/mailer/smtp-server_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_tr.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-server_tr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_tr.html diff --git a/war/resources/help/tasks/mailer/url.html b/core/src/main/resources/hudson/tasks/Mailer/help-url.html similarity index 100% rename from war/resources/help/tasks/mailer/url.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url.html diff --git a/war/resources/help/tasks/mailer/url_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-url_de.html similarity index 100% rename from war/resources/help/tasks/mailer/url_de.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url_de.html diff --git a/war/resources/help/tasks/mailer/url_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-url_fr.html similarity index 100% rename from war/resources/help/tasks/mailer/url_fr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url_fr.html diff --git a/war/resources/help/tasks/mailer/url_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-url_ja.html similarity index 100% rename from war/resources/help/tasks/mailer/url_ja.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url_ja.html diff --git a/war/resources/help/tasks/mailer/url_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-url_nl.html similarity index 100% rename from war/resources/help/tasks/mailer/url_nl.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url_nl.html diff --git a/war/resources/help/tasks/mailer/url_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-url_pt_BR.html similarity index 100% rename from war/resources/help/tasks/mailer/url_pt_BR.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url_pt_BR.html diff --git a/war/resources/help/tasks/mailer/url_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-url_ru.html similarity index 100% rename from war/resources/help/tasks/mailer/url_ru.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url_ru.html diff --git a/war/resources/help/tasks/mailer/url_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-url_tr.html similarity index 100% rename from war/resources/help/tasks/mailer/url_tr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-url_tr.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_de.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl_de.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl_de.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_fr.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl_fr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl_fr.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ja.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl_ja.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ja.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_nl.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl_nl.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl_nl.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_pt_BR.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl_pt_BR.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl_pt_BR.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ru.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl_ru.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ru.html diff --git a/war/resources/help/tasks/mailer/smtp-use-ssl_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_tr.html similarity index 100% rename from war/resources/help/tasks/mailer/smtp-use-ssl_tr.html rename to core/src/main/resources/hudson/tasks/Mailer/help-useSsl_tr.html diff --git a/test/src/test/java/hudson/tasks/MailerTest.java b/test/src/test/java/hudson/tasks/MailerTest.java index dab6043121..1d787d7d5b 100644 --- a/test/src/test/java/hudson/tasks/MailerTest.java +++ b/test/src/test/java/hudson/tasks/MailerTest.java @@ -24,6 +24,7 @@ package hudson.tasks; import hudson.model.FreeStyleProject; +import hudson.tasks.Mailer.DescriptorImpl; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.FailureBuilder; import org.jvnet.hudson.test.HudsonTestCase; @@ -95,4 +96,30 @@ public class MailerTest extends HudsonTestCase { submit(new WebClient().getPage(p,"configure").getFormByName("config")); assertEqualBeans(m,p.getPublishersList().get(Mailer.class),"recipients,dontNotifyEveryUnstableBuild,sendToIndividuals"); } + + public void testGlobalConfigRoundtrip() throws Exception { + DescriptorImpl d = Mailer.descriptor(); + d.setAdminAddress("admin@me"); + d.setDefaultSuffix("default-suffix"); + d.setHudsonUrl("http://nowhere/"); + d.setSmtpHost("smtp.host"); + d.setSmtpPort("1025"); + d.setUseSsl(true); + d.setSmtpAuth("user","pass"); + + submit(new WebClient().goTo("configure").getFormByName("config")); + + assertEquals("admin@me",d.getAdminAddress()); + assertEquals("default-suffix",d.getDefaultSuffix()); + assertEquals("http://nowhere/",d.getUrl()); + assertEquals("smtp.host",d.getSmtpServer()); + assertEquals("1025",d.getSmtpPort()); + assertEquals(true,d.getUseSsl()); + assertEquals("user",d.getSmtpAuthUserName()); + assertEquals("pass",d.getSmtpAuthPassword()); + + d.setUseSsl(false); + submit(new WebClient().goTo("configure").getFormByName("config")); + assertEquals(false,d.getUseSsl()); + } }