plugins = pluginManager.getPlugins();
+
+ if (plugins != null) {
+ for (PluginWrapper plugin : plugins) {
+ colWidthShortName = Math.max(colWidthShortName, plugin.getShortName().length());
+ colWidthDisplayName = Math.max(colWidthDisplayName, plugin.getDisplayName().length());
+ }
+
+ for (PluginWrapper plugin : plugins) {
+ printPlugin(plugin, colWidthShortName, colWidthDisplayName);
+ }
+ }
+ }
+
+ return 0;
+ }
+
+ private void printPlugin(PluginWrapper plugin, int colWidthShortName, int colWidthDisplayName) {
+ final String version;
+
+ if (plugin.hasUpdate()) {
+ UpdateSite.Plugin updateInfo = plugin.getUpdateInfo();
+ version = String.format("%s (%s)", plugin.getVersion(), updateInfo.version);
+ }
+ else {
+ version = plugin.getVersion();
+ }
+
+ String formatString = String.format("%%-%ds %%-%ds %%s", colWidthShortName, colWidthDisplayName);
+ stdout.println(String.format(formatString, plugin.getShortName(), plugin.getDisplayName(), version));
+ }
+}
diff --git a/core/src/main/java/hudson/cli/MailCommand.java b/core/src/main/java/hudson/cli/MailCommand.java
deleted file mode 100644
index e9e97621b7..0000000000
--- a/core/src/main/java/hudson/cli/MailCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2004-2010, Sun Microsystems, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.cli;
-
-import hudson.tasks.Mailer;
-import hudson.Extension;
-import jenkins.model.Jenkins;
-import hudson.model.Item;
-
-import javax.mail.internet.MimeMessage;
-import javax.mail.Transport;
-
-/**
- * Sends e-mail through Hudson.
- *
- *
- * Various platforms have different commands to do this, so on heterogenous platform, doing this via Hudson is easier.
- *
- * @author Kohsuke Kawaguchi
- */
-@Extension
-public class MailCommand extends CLICommand {
- public String getShortDescription() {
- return Messages.MailCommand_ShortDescription();
- }
-
- protected int run() throws Exception {
- Jenkins.getInstance().checkPermission(Item.CONFIGURE);
- Transport.send(new MimeMessage(Mailer.descriptor().createSession(),stdin));
- return 0;
- }
-}
diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java
index 3ceff0a419..f09a1c7247 100644
--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
@@ -30,8 +30,8 @@ import static hudson.init.InitMilestone.PLUGINS_PREPARED;
import hudson.model.AbstractModelObject;
import jenkins.model.Jenkins;
import hudson.model.RSS;
-import hudson.tasks.Mailer;
import hudson.util.CopyOnWriteMap;
+import jenkins.model.JenkinsLocationConfiguration;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
@@ -171,7 +171,7 @@ public class LogRecorderManager extends AbstractModelObject {
}
public String getEntryAuthor(LogRecord entry) {
- return Mailer.descriptor().getAdminAddress();
+ return JenkinsLocationConfiguration.get().getAdminAddress();
}
},req,rsp);
}
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 60e26c9c53..4206884acb 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -69,7 +69,6 @@ import hudson.tasks.BuildStep;
import hudson.tasks.BuildStepDescriptor;
import hudson.tasks.BuildTrigger;
import hudson.tasks.BuildWrapperDescriptor;
-import hudson.tasks.Mailer;
import hudson.tasks.Publisher;
import hudson.triggers.SCMTrigger;
import hudson.triggers.Trigger;
@@ -82,12 +81,14 @@ import hudson.util.FormValidation;
import hudson.widgets.BuildHistoryWidget;
import hudson.widgets.HistoryWidget;
import jenkins.model.Jenkins;
+import jenkins.model.JenkinsLocationConfiguration;
import jenkins.model.lazy.AbstractLazyLoadRunMap.Direction;
import jenkins.scm.DefaultSCMCheckoutStrategyImpl;
import jenkins.scm.SCMCheckoutStrategy;
import jenkins.scm.SCMCheckoutStrategyDescriptor;
import jenkins.util.TimeDuration;
import net.sf.json.JSONObject;
+import org.apache.tools.ant.taskdefs.email.Mailer;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.args4j.Argument;
@@ -2008,7 +2009,7 @@ public abstract class AbstractProject
,R extends A
}
public String getEntryAuthor(FeedItem entry) {
- return Mailer.descriptor().getAdminAddress();
+ return JenkinsLocationConfiguration.get().getAdminAddress();
}
},
req, rsp );
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index b500ee8096..6409ebab32 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -264,12 +264,15 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
if (offlineCause == null) {
return "";
}
- // remove header string from offline cause when a comment was set
- String newString = offlineCause.toString().replaceAll(
- "^Disconnected by [\\w]* \\: ","");
- // remove header string from offline cause when no comment was set
- return newString.replaceAll(
- "^Disconnected by [\\w]*","");
+ // fetch the localized string for "Disconnected By"
+ String gsub_base = hudson.slaves.Messages.SlaveComputer_DisconnectedBy("","");
+ // regex to remove commented reason base string
+ String gsub1 = "^" + gsub_base + "[\\w\\W]* \\: ";
+ // regex to remove non-commented reason base string
+ String gsub2 = "^" + gsub_base + "[\\w\\W]*";
+
+ String newString = offlineCause.toString().replaceAll(gsub1, "");
+ return newString.replaceAll(gsub2, "");
}
/**
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 955eaf7f2d..ce02dca722 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -809,7 +809,7 @@ public abstract class Descriptor> implements Saveable {
}
}
- private XmlFile getConfigFile() {
+ protected final XmlFile getConfigFile() {
return new XmlFile(new File(Jenkins.getInstance().getRootDir(),getId()+".xml"));
}
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index dd322aba4b..8505a705b4 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -77,17 +77,20 @@ public class FileParameterValue extends ParameterValue {
this(name, new FileItemImpl(file), originalFileName);
}
- private FileParameterValue(String name, FileItem file, String originalFileName) {
+ protected FileParameterValue(String name, FileItem file, String originalFileName) {
super(name);
this.file = file;
this.originalFileName = originalFileName;
}
// post initialization hook
- /*package*/ void setLocation(String location) {
+ protected void setLocation(String location) {
this.location = location;
}
+ public String getLocation() {
+ return location;
+ }
/**
* Exposes the originalFileName as an environment variable.
@@ -117,6 +120,10 @@ public class FileParameterValue extends ParameterValue {
return originalFileName;
}
+ public FileItem getFile() {
+ return file;
+ }
+
@Override
public BuildWrapper createBuildWrapper(AbstractBuild,?> build) {
return new BuildWrapper() {
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index c5de1ea5ef..55b7bb8933 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -50,7 +50,6 @@ import hudson.security.AccessControlled;
import hudson.security.Permission;
import hudson.security.PermissionGroup;
import hudson.tasks.LogRotator;
-import hudson.tasks.Mailer;
import hudson.tasks.BuildWrapper;
import hudson.tasks.BuildStep;
import hudson.tasks.test.AbstractTestResultAction;
@@ -96,11 +95,13 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import jenkins.model.Jenkins;
+import jenkins.model.JenkinsLocationConfiguration;
import jenkins.util.io.OnMaster;
import net.sf.json.JSONObject;
import org.apache.commons.io.input.NullInputStream;
import org.apache.commons.io.IOUtils;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.tools.ant.taskdefs.email.Mailer;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.*;
@@ -2149,7 +2150,7 @@ public abstract class Run ,RunT extends Run> extends AbstractLazyLoadRunMap
return r.getId();
}
+ @Override
+ public R put(R r) {
+ return super._put(r);
+ }
+
/**
* Reuses the same reference as much as we can.
*
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 27e8e65bee..b586c0ed11 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -106,7 +106,7 @@ public class UpdateSite {
/**
* Latest data as read from the data file.
*/
- private Data data;
+ private transient Data data;
/**
* ID string for this update source.
diff --git a/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java b/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
index 0dbfec6bc3..de3b806f60 100644
--- a/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
+++ b/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
@@ -5,7 +5,6 @@ import hudson.FilePath;
import hudson.cli.CLICommand;
import jenkins.model.Jenkins;
import hudson.remoting.Callable;
-import hudson.tasks.MailAddressResolver;
import hudson.util.spring.BeanBuilder;
import org.acegisecurity.Authentication;
import org.acegisecurity.AuthenticationException;
@@ -93,7 +92,7 @@ public abstract class AbstractPasswordBasedSecurityRealm extends SecurityRealm i
* return it as a {@link UserDetails} object. {@link org.acegisecurity.userdetails.User} is a convenient
* implementation to use, but if your backend offers additional data, you may want to use your own subtype
* so that the rest of Hudson can use those additional information (such as e-mail address --- see
- * {@link MailAddressResolver}.)
+ * MailAddressResolver.)
*
*
* Properties like {@link UserDetails#getPassword()} make no sense, so just return an empty value from it.
diff --git a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
index 9997405bd1..31dd6855e3 100644
--- a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
+++ b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
@@ -23,47 +23,74 @@
*/
package hudson.security;
+import com.google.common.base.Predicate;
+import hudson.BulkChange;
import hudson.Extension;
+import hudson.Functions;
import hudson.markup.MarkupFormatter;
-import jenkins.model.GlobalConfiguration;
+import hudson.model.Descriptor;
+import hudson.model.Descriptor.FormException;
+import hudson.model.ManagementLink;
+import hudson.util.FormApply;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.ServletException;
+
+import jenkins.model.GlobalConfigurationCategory;
import jenkins.model.Jenkins;
import jenkins.util.ServerTcpPort;
import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
-import java.io.IOException;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
/**
* Security configuration.
*
* @author Kohsuke Kawaguchi
*/
-@Extension(ordinal=200)
-public class GlobalSecurityConfiguration extends GlobalConfiguration {
+@Extension(ordinal = Integer.MAX_VALUE - 210)
+public class GlobalSecurityConfiguration extends ManagementLink {
+
+ private static final Logger LOGGER = Logger.getLogger(GlobalSecurityConfiguration.class.getName());
+
public MarkupFormatter getMarkupFormatter() {
return Jenkins.getInstance().getMarkupFormatter();
}
-
+
public int getSlaveAgentPort() {
return Jenkins.getInstance().getSlaveAgentPort();
}
-
- @Override
- public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+
+ public synchronized void doConfigure(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+ // for compatibility reasons, the actual value is stored in Jenkins
+ BulkChange bc = new BulkChange(Jenkins.getInstance());
+ try{
+ boolean result = configure(req, req.getSubmittedForm());
+ LOGGER.log(Level.FINE, "security saved: "+result);
+ Jenkins.getInstance().save();
+ FormApply.success(req.getContextPath()+"/manage").generateResponse(req, rsp, null);
+ } finally {
+ bc.commit();
+ }
+ }
+
+ public boolean configure(StaplerRequest req, JSONObject json) throws hudson.model.Descriptor.FormException {
// for compatibility reasons, the actual value is stored in Jenkins
Jenkins j = Jenkins.getInstance();
-
+ j.checkPermission(Jenkins.ADMINISTER);
if (json.has("useSecurity")) {
JSONObject security = json.getJSONObject("useSecurity");
j.setSecurityRealm(SecurityRealm.all().newInstanceFromRadioList(security, "realm"));
j.setAuthorizationStrategy(AuthorizationStrategy.all().newInstanceFromRadioList(security, "authorization"));
-
try {
j.setSlaveAgentPort(new ServerTcpPort(security.getJSONObject("slaveAgentPort")).getPort());
} catch (IOException e) {
- throw new FormException(e,"slaveAgentPortType");
+ throw new hudson.model.Descriptor.FormException(e, "slaveAgentPortType");
}
-
if (security.has("markupFormatter")) {
j.setMarkupFormatter(req.bindJSON(MarkupFormatter.class, security.getJSONObject("markupFormatter")));
} else {
@@ -73,7 +100,51 @@ public class GlobalSecurityConfiguration extends GlobalConfiguration {
j.disableSecurity();
}
- return true;
+ // persist all the additional security configs
+ boolean result = true;
+ for(Descriptor> d : Functions.getSortedDescriptorsForGlobalConfig(FILTER)){
+ result &= configureDescriptor(req,json,d);
+ }
+
+ return result;
}
-}
+
+ private boolean configureDescriptor(StaplerRequest req, JSONObject json, Descriptor> d) throws FormException {
+ // collapse the structure to remain backward compatible with the JSON structure before 1.
+ String name = d.getJsonSafeClassName();
+ JSONObject js = json.has(name) ? json.getJSONObject(name) : new JSONObject(); // if it doesn't have the property, the method returns invalid null object.
+ json.putAll(js);
+ return d.configure(req, js);
+ }
+ @Override
+ public String getDisplayName() {
+ return Messages.GlobalSecurityConfiguration_DisplayName();
+ }
+
+ @Override
+ public String getDescription() {
+ return Messages.GlobalSecurityConfiguration_Description();
+ }
+
+ @Override
+ public String getIconFileName() {
+ return "secure.png";
+ }
+
+ @Override
+ public String getUrlName() {
+ return "configureSecurity";
+ }
+
+ @Override
+ public Permission getRequiredPermission() {
+ return Jenkins.ADMINISTER;
+ }
+
+ public static Predicate FILTER = new Predicate() {
+ public boolean apply(GlobalConfigurationCategory input) {
+ return input instanceof GlobalConfigurationCategory.Security;
+ }
+ };
+}
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index 7c3a242824..cb1ce711e7 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -36,7 +36,6 @@ import hudson.model.UserProperty;
import hudson.model.UserPropertyDescriptor;
import hudson.security.FederatedLoginService.FederatedIdentity;
import hudson.security.captcha.CaptchaSupport;
-import hudson.tasks.Mailer;
import hudson.util.PluginServletFilter;
import hudson.util.Protector;
import hudson.util.Scrambler;
@@ -52,6 +51,7 @@ import org.acegisecurity.providers.encoding.PasswordEncoder;
import org.acegisecurity.providers.encoding.ShaPasswordEncoder;
import org.acegisecurity.userdetails.UserDetails;
import org.acegisecurity.userdetails.UsernameNotFoundException;
+import org.apache.tools.ant.taskdefs.email.Mailer;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.ForwardToView;
import org.kohsuke.stapler.HttpResponse;
@@ -72,10 +72,14 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* {@link SecurityRealm} that performs authentication by looking up {@link User}.
@@ -323,8 +327,17 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
// register the user
User user = createAccount(si.username,si.password1);
- user.addProperty(new Mailer.UserProperty(si.email));
user.setFullName(si.fullname);
+ try {
+ // legacy hack. mail support has moved out to a separate plugin
+ Class> up = Jenkins.getInstance().pluginManager.uberClassLoader.loadClass("hudson.tasks.Mailer.UserProperty");
+ Constructor> c = up.getDeclaredConstructor(String.class);
+ user.addProperty((UserProperty)c.newInstance(si.email));
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ LOGGER.log(Level.WARNING, "Failed to set the e-mail address",e);
+ }
user.save();
return user;
}
@@ -689,4 +702,6 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
public void destroy() {
}
};
+
+ private static final Logger LOGGER = Logger.getLogger(HudsonPrivateSecurityRealm.class.getName());
}
diff --git a/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java b/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java
index 29a22202b1..904dbb37d5 100644
--- a/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java
+++ b/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java
@@ -25,6 +25,7 @@ package hudson.security.csrf;
import hudson.Extension;
import jenkins.model.GlobalConfiguration;
+import jenkins.model.GlobalConfigurationCategory;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
import org.kohsuke.stapler.StaplerRequest;
@@ -36,6 +37,11 @@ import org.kohsuke.stapler.StaplerRequest;
*/
@Extension(ordinal=195) // immediately after the security setting
public class GlobalCrumbIssuerConfiguration extends GlobalConfiguration {
+ @Override
+ public GlobalConfigurationCategory getCategory() {
+ return GlobalConfigurationCategory.get(GlobalConfigurationCategory.Security.class);
+ }
+
@Override
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
// for compatibility reasons, the actual value is stored in Jenkins
diff --git a/core/src/main/java/hudson/tasks/MailAddressResolver.java b/core/src/main/java/hudson/tasks/MailAddressResolver.java
deleted file mode 100644
index d914dc2057..0000000000
--- a/core/src/main/java/hudson/tasks/MailAddressResolver.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Luca Domenico Milanesio
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.tasks;
-
-import hudson.Extension;
-import hudson.ExtensionList;
-import hudson.ExtensionListView;
-import hudson.ExtensionPoint;
-import jenkins.model.Jenkins;
-import hudson.model.User;
-import hudson.model.UserProperty;
-import hudson.scm.SCM;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Infers e-mail addresses for the user when none is specified.
- *
- *
- * This is an extension point of Jenkins. Plugins that contribute a new implementation
- * of this class should put {@link Extension} on your implementation class, like this:
- *
- *
- * @Extension
- * class MyMailAddressResolver extends {@link MailAddressResolver} {
- * ...
- * }
- *
- *
- * Techniques
- *
- * User identity in Jenkins is global, and not specific to a particular job. As a result, mail address resolution
- * only receives {@link User}, which by itself doesn't really have that much information in it.
- *
- *
- * So the common technique for a mail address resolution is to define your own {@link UserProperty} types and
- * add it to {@link User} objects where more context is available. For example, an {@link SCM} implementation
- * can have a lot more information about a particular user during a check out, so that would be a good place
- * to capture information as {@link UserProperty}, which then later used by a {@link MailAddressResolver}.
- *
- * @author Kohsuke Kawaguchi
- * @since 1.192
- */
-public abstract class MailAddressResolver implements ExtensionPoint {
- /**
- * Infers e-mail address of the given user.
- *
- *
- * This method is called when a {@link User} without explicitly configured e-mail
- * address is used, as an attempt to infer e-mail address.
- *
- *
- * The normal strategy is to look at {@link User#getProjects() the projects that the user
- * is participating}, then use the repository information to infer the e-mail address.
- *
- *
- * When multiple resolvers are installed, they are consulted in order and
- * the search will be over when an address is inferred by someone.
- *
- *
- * Since {@link MailAddressResolver} is singleton, this method can be invoked concurrently
- * from multiple threads.
- *
- * @return
- * null if the inference failed.
- */
- public abstract String findMailAddressFor(User u);
-
- public static String resolve(User u) {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Resolving e-mail address for \""+u+"\" ID="+u.getId());
- }
-
- for (MailAddressResolver r : all()) {
- String email = r.findMailAddressFor(u);
- if(email!=null) {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine(r+" resolved "+u.getId()+" to "+email);
- }
- return email;
- }
- }
-
- // fall back logic
- String extractedAddress = extractAddressFromId(u.getFullName());
- if (extractedAddress != null)
- return extractedAddress;
-
- if(u.getFullName().contains("@"))
- // this already looks like an e-mail ID
- return u.getFullName();
-
- String ds = Mailer.descriptor().getDefaultSuffix();
- if(ds!=null) {
- // another common pattern is "DOMAIN\person" in Windows. Only
- // do this when this full name is not manually set. see HUDSON-5164
- Matcher m = WINDOWS_DOMAIN_REGEXP.matcher(u.getFullName());
- if (m.matches() && u.getFullName().replace('\\','_').equals(u.getId()))
- return m.group(1)+ds; // user+defaultSuffix
-
- return u.getId()+ds;
- } else
- return null;
- }
-
- /**
- * Tries to extract an email address from the user id, or returns null
- */
- private static String extractAddressFromId(String id) {
- Matcher m = EMAIL_ADDRESS_REGEXP.matcher(id);
- if(m.matches())
- return m.group(1);
- return null;
- }
-
- /**
- * Matches strings like "Kohsuke Kawaguchi <kohsuke.kawaguchi@sun.com>"
- * @see #extractAddressFromId(String)
- */
- private static final Pattern EMAIL_ADDRESS_REGEXP = Pattern.compile("^.*<([^>]+)>.*$");
-
- /**
- * Matches something like "DOMAIN\person"
- */
- private static final Pattern WINDOWS_DOMAIN_REGEXP = Pattern.compile("[^\\\\ ]+\\\\([^\\\\ ]+)");
-
- /**
- * All registered {@link MailAddressResolver} implementations.
- *
- * @deprecated as of 1.286
- * Use {@link #all()} for read access and {@link Extension} for registration.
- */
- public static final List LIST = ExtensionListView.createList(MailAddressResolver.class);
-
- /**
- * Returns all the registered {@link MailAddressResolver} descriptors.
- */
- public static ExtensionList all() {
- return Jenkins.getInstance().getExtensionList(MailAddressResolver.class);
- }
-
- private static final Logger LOGGER = Logger.getLogger(MailAddressResolver.class.getName());
-}
diff --git a/core/src/main/java/hudson/tasks/MailMessageIdAction.java b/core/src/main/java/hudson/tasks/MailMessageIdAction.java
deleted file mode 100755
index 105a48e9ee..0000000000
--- a/core/src/main/java/hudson/tasks/MailMessageIdAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.tasks;
-
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import hudson.model.Action;
-import hudson.model.Run;
-import hudson.util.LRUStringConverter;
-
-/**
- * Remembers the message ID of the e-mail that was sent for the build.
- *
- *
- * This allows us to send further updates as replies.
- *
- * @author Kohsuke Kawaguchi
- */
-public class MailMessageIdAction implements Action {
-
- static {
- Run.XSTREAM.processAnnotations(MailMessageIdAction.class);
- }
-
- /**
- * Message ID of the e-mail sent for the build.
- */
- @XStreamConverter(LRUStringConverter.class)
- public final String messageId;
-
- public MailMessageIdAction(String messageId) {
- this.messageId = messageId;
- }
-
- public String getIconFileName() {
- return null;
- }
-
- public String getDisplayName() {
- return "Message Id"; // but this is never supposed to be displayed
- }
-
- public String getUrlName() {
- return null; // no web binding
- }
-}
diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java
deleted file mode 100644
index 5b3b4d7f0c..0000000000
--- a/core/src/main/java/hudson/tasks/MailSender.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi,
- * Bruce Chapman, Daniel Dyer, Jean-Baptiste Quenot
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.tasks;
-
-import hudson.FilePath;
-import hudson.Util;
-import hudson.Functions;
-import hudson.model.*;
-import hudson.scm.ChangeLogSet;
-import jenkins.model.Jenkins;
-
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.AddressException;
-
-import org.apache.commons.lang.StringUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Core logic of sending out notification e-mail.
- *
- * @author Jesse Glick
- * @author Kohsuke Kawaguchi
- */
-public class MailSender {
- /**
- * Whitespace-separated list of e-mail addresses that represent recipients.
- */
- private String recipients;
-
- private List includeUpstreamCommitters = new ArrayList();
-
- /**
- * If true, only the first unstable build will be reported.
- */
- private boolean dontNotifyEveryUnstableBuild;
-
- /**
- * If true, individuals will receive e-mails regarding who broke the build.
- */
- private boolean sendToIndividuals;
-
- /**
- * The charset to use for the text and subject.
- */
- private String charset;
-
-
- public MailSender(String recipients, boolean dontNotifyEveryUnstableBuild, boolean sendToIndividuals) {
- this(recipients, dontNotifyEveryUnstableBuild, sendToIndividuals, "UTF-8");
- }
-
- public MailSender(String recipients, boolean dontNotifyEveryUnstableBuild, boolean sendToIndividuals, String charset) {
- this(recipients,dontNotifyEveryUnstableBuild,sendToIndividuals,charset, Collections.emptyList());
- }
-
- public MailSender(String recipients, boolean dontNotifyEveryUnstableBuild, boolean sendToIndividuals, String charset, Collection includeUpstreamCommitters) {
- this.recipients = recipients;
- this.dontNotifyEveryUnstableBuild = dontNotifyEveryUnstableBuild;
- this.sendToIndividuals = sendToIndividuals;
- this.charset = charset;
- this.includeUpstreamCommitters.addAll(includeUpstreamCommitters);
- }
-
- public boolean execute(AbstractBuild, ?> build, BuildListener listener) throws InterruptedException {
- try {
- MimeMessage mail = getMail(build, listener);
- if (mail != null) {
- // if the previous e-mail was sent for a success, this new e-mail
- // is not a follow up
- AbstractBuild, ?> pb = build.getPreviousBuild();
- if(pb!=null && pb.getResult()==Result.SUCCESS) {
- mail.removeHeader("In-Reply-To");
- mail.removeHeader("References");
- }
-
- Address[] allRecipients = mail.getAllRecipients();
- if (allRecipients != null) {
- StringBuilder buf = new StringBuilder("Sending e-mails to:");
- for (Address a : allRecipients)
- buf.append(' ').append(a);
- listener.getLogger().println(buf);
- Transport.send(mail);
-
- build.addAction(new MailMessageIdAction(mail.getMessageID()));
- } else {
- listener.getLogger().println(Messages.MailSender_ListEmpty());
- }
- }
- } catch (MessagingException e) {
- e.printStackTrace(listener.error(e.getMessage()));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace(listener.error(e.getMessage()));
- } finally {
- CHECKPOINT.report();
- }
-
- return true;
- }
-
- /**
- * To correctly compute the state change from the previous build to this build,
- * we need to ignore aborted builds.
- * See http://www.nabble.com/Losing-build-state-after-aborts--td24335949.html
- *
- *
- * And since we are consulting the earlier result, we need to wait for the previous build
- * to pass the check point.
- */
- private Result findPreviousBuildResult(AbstractBuild,?> b) throws InterruptedException {
- CHECKPOINT.block();
- do {
- b=b.getPreviousBuild();
- if(b==null) return null;
- } while((b.getResult()==Result.ABORTED) || (b.getResult()==Result.NOT_BUILT));
- return b.getResult();
- }
-
- protected MimeMessage getMail(AbstractBuild, ?> build, BuildListener listener) throws MessagingException, UnsupportedEncodingException, InterruptedException {
- if (build.getResult() == Result.FAILURE) {
- return createFailureMail(build, listener);
- }
-
- if (build.getResult() == Result.UNSTABLE) {
- if (!dontNotifyEveryUnstableBuild)
- return createUnstableMail(build, listener);
- Result prev = findPreviousBuildResult(build);
- if (prev == Result.SUCCESS)
- return createUnstableMail(build, listener);
- }
-
- if (build.getResult() == Result.SUCCESS) {
- Result prev = findPreviousBuildResult(build);
- if (prev == Result.FAILURE)
- return createBackToNormalMail(build, Messages.MailSender_BackToNormal_Normal(), listener);
- if (prev == Result.UNSTABLE)
- return createBackToNormalMail(build, Messages.MailSender_BackToNormal_Stable(), listener);
- }
-
- return null;
- }
-
- private MimeMessage createBackToNormalMail(AbstractBuild, ?> build, String subject, BuildListener listener) throws MessagingException, UnsupportedEncodingException {
- MimeMessage msg = createEmptyMail(build, listener);
-
- msg.setSubject(getSubject(build, Messages.MailSender_BackToNormalMail_Subject(subject)),charset);
- StringBuilder buf = new StringBuilder();
- appendBuildUrl(build, buf);
- msg.setText(buf.toString(),charset);
-
- return msg;
- }
-
- private MimeMessage createUnstableMail(AbstractBuild, ?> build, BuildListener listener) throws MessagingException, UnsupportedEncodingException {
- MimeMessage msg = createEmptyMail(build, listener);
-
- String subject = Messages.MailSender_UnstableMail_Subject();
-
- AbstractBuild, ?> prev = build.getPreviousBuild();
- boolean still = false;
- if(prev!=null) {
- if(prev.getResult()==Result.SUCCESS)
- subject =Messages.MailSender_UnstableMail_ToUnStable_Subject();
- else if(prev.getResult()==Result.UNSTABLE) {
- subject = Messages.MailSender_UnstableMail_StillUnstable_Subject();
- still = true;
- }
- }
-
- msg.setSubject(getSubject(build, subject),charset);
- StringBuilder buf = new StringBuilder();
- // Link to project changes summary for "still unstable" if this or last build has changes
- if (still && !(build.getChangeSet().isEmptySet() && prev.getChangeSet().isEmptySet()))
- appendUrl(Util.encode(build.getProject().getUrl()) + "changes", buf);
- else
- appendBuildUrl(build, buf);
- msg.setText(buf.toString(), charset);
-
- return msg;
- }
-
- private void appendBuildUrl(AbstractBuild, ?> build, StringBuilder buf) {
- appendUrl(Util.encode(build.getUrl())
- + (build.getChangeSet().isEmptySet() ? "" : "changes"), buf);
- }
-
- private void appendUrl(String url, StringBuilder buf) {
- String baseUrl = Mailer.descriptor().getUrl();
- if (baseUrl != null)
- buf.append(Messages.MailSender_Link(baseUrl, url)).append("\n\n");
- }
-
- private MimeMessage createFailureMail(AbstractBuild, ?> build, BuildListener listener) throws MessagingException, UnsupportedEncodingException, InterruptedException {
- MimeMessage msg = createEmptyMail(build, listener);
-
- msg.setSubject(getSubject(build, Messages.MailSender_FailureMail_Subject()),charset);
-
- StringBuilder buf = new StringBuilder();
- appendBuildUrl(build, buf);
-
- boolean firstChange = true;
- for (ChangeLogSet.Entry entry : build.getChangeSet()) {
- if (firstChange) {
- firstChange = false;
- buf.append(Messages.MailSender_FailureMail_Changes()).append("\n\n");
- }
- buf.append('[');
- buf.append(entry.getAuthor().getFullName());
- buf.append("] ");
- String m = entry.getMsg();
- if (m!=null) {
- buf.append(m);
- if (!m.endsWith("\n")) {
- buf.append('\n');
- }
- }
- buf.append('\n');
- }
-
- buf.append("------------------------------------------\n");
-
- try {
- // Restrict max log size to avoid sending enormous logs over email.
- // Interested users can always look at the log on the web server.
- List lines = build.getLog(MAX_LOG_LINES);
-
- String workspaceUrl = null, artifactUrl = null;
- Pattern wsPattern = null;
- String baseUrl = Mailer.descriptor().getUrl();
- if (baseUrl != null) {
- // Hyperlink local file paths to the repository workspace or build artifacts.
- // Note that it is possible for a failure mail to refer to a file using a workspace
- // URL which has already been corrected in a subsequent build. To fix, archive.
- workspaceUrl = baseUrl + Util.encode(build.getProject().getUrl()) + "ws/";
- artifactUrl = baseUrl + Util.encode(build.getUrl()) + "artifact/";
- FilePath ws = build.getWorkspace();
- // Match either file or URL patterns, i.e. either
- // c:\hudson\workdir\jobs\foo\workspace\src\Foo.java
- // file:/c:/hudson/workdir/jobs/foo/workspace/src/Foo.java
- // will be mapped to one of:
- // http://host/hudson/job/foo/ws/src/Foo.java
- // http://host/hudson/job/foo/123/artifact/src/Foo.java
- // Careful with path separator between $1 and $2:
- // workspaceDir will not normally end with one;
- // workspaceDir.toURI() will end with '/' if and only if workspaceDir.exists() at time of call
- wsPattern = Pattern.compile("(" +
- Pattern.quote(ws.getRemote()) + "|" + Pattern.quote(ws.toURI().toString()) + ")[/\\\\]?([^:#\\s]*)");
- }
- for (String line : lines) {
- line = line.replace('\0',' '); // shall we replace other control code? This one is motivated by http://www.nabble.com/Problems-with-NULL-characters-in-generated-output-td25005177.html
- if (wsPattern != null) {
- // Perl: $line =~ s{$rx}{$path = $2; $path =~ s!\\\\!/!g; $workspaceUrl . $path}eg;
- Matcher m = wsPattern.matcher(line);
- int pos = 0;
- while (m.find(pos)) {
- String path = m.group(2).replace(File.separatorChar, '/');
- String linkUrl = artifactMatches(path, build) ? artifactUrl : workspaceUrl;
- String prefix = line.substring(0, m.start()) + '<' + linkUrl + Util.encode(path) + '>';
- pos = prefix.length();
- line = prefix + line.substring(m.end());
- // XXX better style to reuse Matcher and fix offsets, but more work
- m = wsPattern.matcher(line);
- }
- }
- buf.append(line);
- buf.append('\n');
- }
- } catch (IOException e) {
- // somehow failed to read the contents of the log
- buf.append(Messages.MailSender_FailureMail_FailedToAccessBuildLog()).append("\n\n").append(Functions.printThrowable(e));
- }
-
- msg.setText(buf.toString(),charset);
-
- return msg;
- }
-
- private MimeMessage createEmptyMail(AbstractBuild, ?> build, BuildListener listener) throws MessagingException, UnsupportedEncodingException {
- MimeMessage msg = new MimeMessage(Mailer.descriptor().createSession());
- // TODO: I'd like to put the URL to the page in here,
- // but how do I obtain that?
- msg.addHeader("X-Jenkins-Job", build.getProject().getDisplayName());
- msg.addHeader("X-Jenkins-Result", build.getResult().toString());
- msg.setContent("", "text/plain");
- msg.setFrom(Mailer.StringToAddress(Mailer.descriptor().getAdminAddress(), charset));
- msg.setSentDate(new Date());
-
- String replyTo = Mailer.descriptor().getReplyToAddress();
- if (StringUtils.isNotBlank(replyTo)) {
- msg.setReplyTo(new Address[]{Mailer.StringToAddress(replyTo, charset)});
- }
-
- Set rcp = new LinkedHashSet();
- String defaultSuffix = Mailer.descriptor().getDefaultSuffix();
- StringTokenizer tokens = new StringTokenizer(recipients);
- while (tokens.hasMoreTokens()) {
- String address = tokens.nextToken();
- if(address.startsWith("upstream-individuals:")) {
- // people who made a change in the upstream
- String projectName = address.substring("upstream-individuals:".length());
- AbstractProject up = Jenkins.getInstance().getItem(projectName,build.getProject(),AbstractProject.class);
- if(up==null) {
- listener.getLogger().println("No such project exist: "+projectName);
- continue;
- }
- includeCulpritsOf(up, build, listener, rcp);
- } else {
- // ordinary address
-
- // if not a valid address (i.e. no '@'), then try adding suffix
- if (!address.contains("@") && defaultSuffix != null && defaultSuffix.contains("@")) {
- address += defaultSuffix;
- }
-
- try {
- rcp.add(Mailer.StringToAddress(address, charset));
- } catch (AddressException e) {
- // report bad address, but try to send to other addresses
- listener.getLogger().println("Unable to send to address: " + address);
- e.printStackTrace(listener.error(e.getMessage()));
- }
- }
- }
-
- for (AbstractProject project : includeUpstreamCommitters) {
- includeCulpritsOf(project, build, listener, rcp);
- }
-
- if (sendToIndividuals) {
- Set culprits = build.getCulprits();
-
- if(debug)
- listener.getLogger().println("Trying to send e-mails to individuals who broke the build. sizeof(culprits)=="+culprits.size());
-
- rcp.addAll(buildCulpritList(listener,culprits));
- }
- msg.setRecipients(Message.RecipientType.TO, rcp.toArray(new InternetAddress[rcp.size()]));
-
- AbstractBuild, ?> pb = build.getPreviousBuild();
- if(pb!=null) {
- MailMessageIdAction b = pb.getAction(MailMessageIdAction.class);
- if(b!=null) {
- msg.setHeader("In-Reply-To",b.messageId);
- msg.setHeader("References",b.messageId);
- }
- }
-
- return msg;
- }
-
- void includeCulpritsOf(AbstractProject upstreamProject, AbstractBuild, ?> currentBuild, BuildListener listener, Set recipientList) throws AddressException, UnsupportedEncodingException {
- AbstractBuild,?> upstreamBuild = currentBuild.getUpstreamRelationshipBuild(upstreamProject);
- AbstractBuild,?> previousBuild = currentBuild.getPreviousBuild();
- AbstractBuild,?> previousBuildUpstreamBuild = previousBuild!=null ? previousBuild.getUpstreamRelationshipBuild(upstreamProject) : null;
- if(previousBuild==null && upstreamBuild==null && previousBuildUpstreamBuild==null) {
- listener.getLogger().println("Unable to compute the changesets in "+ upstreamProject +". Is the fingerprint configured?");
- return;
- }
- if(previousBuild==null || upstreamBuild==null || previousBuildUpstreamBuild==null) {
- listener.getLogger().println("Unable to compute the changesets in "+ upstreamProject);
- return;
- }
- AbstractBuild,?> b=previousBuildUpstreamBuild;
- do {
- b = b.getNextBuild();
- if (b != null) {
- recipientList.addAll(buildCulpritList(listener,b.getCulprits()));
- }
- } while ( b != upstreamBuild && b != null );
- }
-
- private Set buildCulpritList(BuildListener listener, Set culprits) throws AddressException, UnsupportedEncodingException {
- Set r = new HashSet();
- for (User a : culprits) {
- String adrs = Util.fixEmpty(a.getProperty(Mailer.UserProperty.class).getAddress());
- if(debug)
- listener.getLogger().println(" User "+a.getId()+" -> "+adrs);
- if (adrs != null)
- try {
- r.add(Mailer.StringToAddress(adrs, charset));
- } catch(AddressException e) {
- listener.getLogger().println("Invalid address: " + adrs);
- }
- else {
- listener.getLogger().println(Messages.MailSender_NoAddress(a.getFullName()));
- }
- }
- return r;
- }
-
- private String getSubject(AbstractBuild, ?> build, String caption) {
- return caption + ' ' + build.getFullDisplayName();
- }
-
- /**
- * Check whether a path (/-separated) will be archived.
- */
- protected boolean artifactMatches(String path, AbstractBuild, ?> build) {
- return false;
- }
-
- public static boolean debug = false;
-
- private static final int MAX_LOG_LINES = Integer.getInteger(MailSender.class.getName()+".maxLogLines",250);
-
-
- /**
- * Sometimes the outcome of the previous build affects the e-mail we send, hence this checkpoint.
- */
- private static final CheckPoint CHECKPOINT = new CheckPoint("mail sent");
-
- static {
- // Fix JENKINS-9006
- // When sending to multiple recipients, send to valid recipients even if some are
- // invalid, unless we have explicitly said otherwise.
- for (String property: Arrays.asList("mail.smtp.sendpartial", "mail.smtps.sendpartial")) {
- if (System.getProperty(property) == null) {
- System.setProperty(property, "true");
- }
- }
- }
-}
diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java
deleted file mode 100644
index 586be973da..0000000000
--- a/core/src/main/java/hudson/tasks/Mailer.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2004-2011, Sun Microsystems, Inc., Kohsuke Kawaguchi,
- * Bruce Chapman, Erik Ramfelt, Jean-Baptiste Quenot, Luca Domenico Milanesio
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.tasks;
-
-import static hudson.Util.fixEmptyAndTrim;
-
-import hudson.EnvVars;
-import hudson.Extension;
-import hudson.Functions;
-import hudson.Launcher;
-import hudson.RestrictedSince;
-import hudson.Util;
-import hudson.model.AbstractBuild;
-import hudson.model.AbstractProject;
-import hudson.model.BuildListener;
-import hudson.model.User;
-import hudson.model.UserPropertyDescriptor;
-import hudson.util.FormValidation;
-import hudson.util.Secret;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.tools.ant.types.selectors.SelectorUtils;
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.export.Exported;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Date;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import javax.mail.Address;
-import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.servlet.ServletException;
-
-import org.apache.tools.ant.types.selectors.SelectorUtils;
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.export.Exported;
-
-import jenkins.model.Jenkins;
-import net.sf.json.JSONObject;
-
-/**
- * {@link Publisher} that sends the build result in e-mail.
- *
- * @author Kohsuke Kawaguchi
- */
-public class Mailer extends Notifier {
- protected static final Logger LOGGER = Logger.getLogger(Mailer.class.getName());
-
- /**
- * Whitespace-separated list of e-mail addresses that represent recipients.
- */
- public String recipients;
-
- /**
- * If true, only the first unstable build will be reported.
- */
- public boolean dontNotifyEveryUnstableBuild;
-
- /**
- * If true, individuals will receive e-mails regarding who broke the build.
- */
- public boolean sendToIndividuals;
-
- @Override
- public boolean perform(AbstractBuild,?> build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
- if(debug)
- listener.getLogger().println("Running mailer");
- // substitute build parameters
- EnvVars env = build.getEnvironment(listener);
- String recip = env.expand(recipients);
-
- return new MailSender(recip, dontNotifyEveryUnstableBuild, sendToIndividuals, descriptor().getCharset()) {
- /** Check whether a path (/-separated) will be archived. */
- @Override
- public boolean artifactMatches(String path, AbstractBuild,?> build) {
- ArtifactArchiver aa = build.getProject().getPublishersList().get(ArtifactArchiver.class);
- if (aa == null) {
- LOGGER.finer("No ArtifactArchiver found");
- return false;
- }
- String artifacts = aa.getArtifacts();
- for (String include : artifacts.split("[, ]+")) {
- String pattern = include.replace(File.separatorChar, '/');
- if (pattern.endsWith("/")) {
- pattern += "**";
- }
- if (SelectorUtils.matchPath(pattern, path)) {
- LOGGER.log(Level.FINER, "DescriptorImpl.artifactMatches true for {0} against {1}", new Object[] {path, pattern});
- return true;
- }
- }
- LOGGER.log(Level.FINER, "DescriptorImpl.artifactMatches for {0} matched none of {1}", new Object[] {path, artifacts});
- return false;
- }
- }.execute(build,listener);
- }
-
- /**
- * This class does explicit check pointing.
- */
- public BuildStepMonitor getRequiredMonitorService() {
- return BuildStepMonitor.NONE;
- }
-
- private static Pattern ADDRESS_PATTERN = Pattern.compile("\\s*([^<]*)<([^>]+)>\\s*");
- public static InternetAddress StringToAddress(String strAddress, String charset) throws AddressException, UnsupportedEncodingException {
- Matcher m = ADDRESS_PATTERN.matcher(strAddress);
- if(!m.matches()) {
- return new InternetAddress(strAddress);
- }
-
- String personal = m.group(1);
- String address = m.group(2);
- return new InternetAddress(address, personal, charset);
- }
-
- /**
- * @deprecated as of 1.286
- * Use {@link #descriptor()} to obtain the current instance.
- */
- @Restricted(NoExternalUse.class)
- @RestrictedSince("1.355")
- public static DescriptorImpl DESCRIPTOR;
-
- public static DescriptorImpl descriptor() {
- return Jenkins.getInstance().getDescriptorByType(Mailer.DescriptorImpl.class);
- }
-
- @Extension
- public static final class DescriptorImpl extends BuildStepDescriptor {
- /**
- * The default e-mail address suffix appended to the user name found from changelog,
- * to send e-mails. Null if not configured.
- */
- private String defaultSuffix;
-
- /**
- * Hudson's own URL, to put into the e-mail.
- */
- private String hudsonUrl;
-
- /**
- * If non-null, use SMTP-AUTH with these information.
- */
- private String smtpAuthUsername;
-
- private Secret smtpAuthPassword;
-
- /**
- * The e-mail address that Hudson puts to "From:" field in outgoing e-mails.
- * Null if not configured.
- */
- private String adminAddress;
-
- /**
- * The e-mail address that Jenkins puts to "Reply-To" header in outgoing e-mails.
- * Null if not configured.
- */
- private String replyToAddress;
-
- /**
- * The SMTP server to use for sending e-mail. Null for default to the environment,
- * which is usually localhost.
- */
- private String smtpHost;
-
- /**
- * If true use SSL on port 465 (standard SMTPS) unless smtpPort is set.
- */
- private boolean useSsl;
-
- /**
- * The SMTP port to use for sending e-mail. Null for default to the environment,
- * which is usually 25.
- */
- private String smtpPort;
-
- /**
- * The charset to use for the text and subject.
- */
- private String charset;
-
- /**
- * Used to keep track of number test e-mails.
- */
- private static transient int testEmailCount = 0;
-
-
- public DescriptorImpl() {
- load();
- DESCRIPTOR = this;
- }
-
- public String getDisplayName() {
- return Messages.Mailer_DisplayName();
- }
-
- @Override
- public String getHelpFile() {
- return "/help/project-config/mailer.html";
- }
-
- public String getDefaultSuffix() {
- return defaultSuffix;
- }
-
- public String getReplyToAddress() {
- return replyToAddress;
- }
-
- public void setReplyToAddress(String address) {
- this.replyToAddress = Util.fixEmpty(address);
- }
-
- /** JavaMail session. */
- public Session createSession() {
- return createSession(smtpHost,smtpPort,useSsl,smtpAuthUsername,smtpAuthPassword);
- }
- private static Session createSession(String smtpHost, String smtpPort, boolean useSsl, String smtpAuthUserName, Secret smtpAuthPassword) {
- smtpPort = fixEmptyAndTrim(smtpPort);
- smtpAuthUserName = fixEmptyAndTrim(smtpAuthUserName);
-
- Properties props = new Properties(System.getProperties());
- if(fixEmptyAndTrim(smtpHost)!=null)
- props.put("mail.smtp.host",smtpHost);
- if (smtpPort!=null) {
- props.put("mail.smtp.port", smtpPort);
- }
- if (useSsl) {
- /* This allows the user to override settings by setting system properties but
- * also allows us to use the default SMTPs port of 465 if no port is already set.
- * It would be cleaner to use smtps, but that's done by calling session.getTransport()...
- * and thats done in mail sender, and it would be a bit of a hack to get it all to
- * coordinate, and we can make it work through setting mail.smtp properties.
- */
- if (props.getProperty("mail.smtp.socketFactory.port") == null) {
- String port = smtpPort==null?"465":smtpPort;
- props.put("mail.smtp.port", port);
- props.put("mail.smtp.socketFactory.port", port);
- }
- if (props.getProperty("mail.smtp.socketFactory.class") == null) {
- props.put("mail.smtp.socketFactory.class","javax.net.ssl.SSLSocketFactory");
- }
- props.put("mail.smtp.socketFactory.fallback", "false");
- }
- if(smtpAuthUserName!=null)
- props.put("mail.smtp.auth","true");
-
- // avoid hang by setting some timeout.
- props.put("mail.smtp.timeout","60000");
- props.put("mail.smtp.connectiontimeout","60000");
-
- return Session.getInstance(props,getAuthenticator(smtpAuthUserName,Secret.toString(smtpAuthPassword)));
- }
-
- private static Authenticator getAuthenticator(final String smtpAuthUserName, final String smtpAuthPassword) {
- if(smtpAuthUserName==null) return null;
- return new Authenticator() {
- @Override
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication(smtpAuthUserName,smtpAuthPassword);
- }
- };
- }
-
- @Override
- public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
- // this code is brain dead
- smtpHost = nullify(json.getString("smtpServer"));
- setAdminAddress(json.getString("adminAddress"));
- setReplyToAddress(json.getString("replyToAddress"));
-
- defaultSuffix = nullify(json.getString("defaultSuffix"));
- String url = nullify(json.getString("url"));
- if(url!=null && !url.endsWith("/"))
- url += '/';
- hudsonUrl = url;
-
- if(json.has("useSMTPAuth")) {
- JSONObject auth = json.getJSONObject("useSMTPAuth");
- smtpAuthUsername = nullify(auth.getString("smtpAuthUserName"));
- smtpAuthPassword = Secret.fromString(nullify(auth.getString("smtpAuthPassword")));
- } else {
- smtpAuthUsername = null;
- smtpAuthPassword = null;
- }
- smtpPort = nullify(json.getString("smtpPort"));
- useSsl = json.getBoolean("useSsl");
- charset = json.getString("charset");
- if (charset == null || charset.length() == 0)
- charset = "UTF-8";
-
- save();
- return true;
- }
-
- private String nullify(String v) {
- if(v!=null && v.length()==0) v=null;
- return v;
- }
-
- public String getSmtpServer() {
- return smtpHost;
- }
-
- public String getAdminAddress() {
- String v = adminAddress;
- if(v==null) v = Messages.Mailer_Address_Not_Configured();
- return v;
- }
-
- public String getUrl() {
- return hudsonUrl;
- }
-
- public String getSmtpAuthUserName() {
- return smtpAuthUsername;
- }
-
- public String getSmtpAuthPassword() {
- if (smtpAuthPassword==null) return null;
- return Secret.toString(smtpAuthPassword);
- }
-
- public boolean getUseSsl() {
- return useSsl;
- }
-
- public String getSmtpPort() {
- return smtpPort;
- }
-
- public String getCharset() {
- String c = charset;
- if (c == null || c.length() == 0) c = "UTF-8";
- return c;
- }
-
- public void setDefaultSuffix(String defaultSuffix) {
- this.defaultSuffix = defaultSuffix;
- }
-
- public void setHudsonUrl(String hudsonUrl) {
- this.hudsonUrl = hudsonUrl;
- }
-
- public void setAdminAddress(String adminAddress) {
- if(adminAddress.startsWith("\"") && adminAddress.endsWith("\"")) {
- // some users apparently quote the whole thing. Don't konw why
- // anyone does this, but it's a machine's job to forgive human mistake
- adminAddress = adminAddress.substring(1,adminAddress.length()-1);
- }
- this.adminAddress = adminAddress;
- }
-
- public void setSmtpHost(String smtpHost) {
- this.smtpHost = smtpHost;
- }
-
- public void setUseSsl(boolean useSsl) {
- this.useSsl = useSsl;
- }
-
- public void setSmtpPort(String smtpPort) {
- this.smtpPort = smtpPort;
- }
-
- public void setCharset(String chaset) {
- this.charset = chaset;
- }
-
- public void setSmtpAuth(String userName, String password) {
- this.smtpAuthUsername = userName;
- this.smtpAuthPassword = Secret.fromString(password);
- }
-
- @Override
- public Publisher newInstance(StaplerRequest req, JSONObject formData) {
- Mailer m = new Mailer();
- req.bindParameters(m,"mailer_");
- m.dontNotifyEveryUnstableBuild = req.getParameter("mailer_notifyEveryUnstableBuild")==null;
-
- if(hudsonUrl==null) {
- // if Hudson URL is not configured yet, infer some default
- hudsonUrl = Functions.inferHudsonURL(req);
- save();
- }
-
- return m;
- }
-
- /**
- * Checks the URL in global.jelly
- */
- public FormValidation doCheckUrl(@QueryParameter String value) {
- if(value.startsWith("http://localhost"))
- return FormValidation.warning(Messages.Mailer_Localhost_Error());
- return FormValidation.ok();
- }
-
- public FormValidation doAddressCheck(@QueryParameter String value) {
- try {
- new InternetAddress(value);
- return FormValidation.ok();
- } catch (AddressException e) {
- return FormValidation.error(e.getMessage());
- }
- }
-
- public FormValidation doCheckSmtpServer(@QueryParameter String value) {
- try {
- if (fixEmptyAndTrim(value)!=null)
- InetAddress.getByName(value);
- return FormValidation.ok();
- } catch (UnknownHostException e) {
- return FormValidation.error(Messages.Mailer_Unknown_Host_Name()+value);
- }
- }
-
- public FormValidation doCheckAdminAddress(@QueryParameter String value) {
- return doAddressCheck(value);
- }
-
- public FormValidation doCheckDefaultSuffix(@QueryParameter String value) {
- if (value.matches("@[A-Za-z0-9.\\-]+") || fixEmptyAndTrim(value)==null)
- return FormValidation.ok();
- else
- return FormValidation.error(Messages.Mailer_Suffix_Error());
- }
-
- /**
- * Send an email to the admin address
- * @throws IOException
- * @throws ServletException
- * @throws InterruptedException
- */
- public FormValidation doSendTestMail(
- @QueryParameter String smtpServer, @QueryParameter String adminAddress, @QueryParameter boolean useSMTPAuth,
- @QueryParameter String smtpAuthUserName, @QueryParameter String smtpAuthPassword,
- @QueryParameter boolean useSsl, @QueryParameter String smtpPort, @QueryParameter String charset,
- @QueryParameter String sendTestMailTo) throws IOException, ServletException, InterruptedException {
- try {
- if (!useSMTPAuth) smtpAuthUserName = smtpAuthPassword = null;
-
- MimeMessage msg = new MimeMessage(createSession(smtpServer,smtpPort,useSsl,smtpAuthUserName,Secret.fromString(smtpAuthPassword)));
- msg.setSubject(Messages.Mailer_TestMail_Subject(++testEmailCount), charset);
- msg.setText(Messages.Mailer_TestMail_Content(testEmailCount, Jenkins.getInstance().getDisplayName()), charset);
- msg.setFrom(StringToAddress(adminAddress, charset));
- if (StringUtils.isNotBlank(replyToAddress)) {
- msg.setReplyTo(new Address[]{StringToAddress(replyToAddress, charset)});
- }
- msg.setSentDate(new Date());
- msg.setRecipient(Message.RecipientType.TO, StringToAddress(sendTestMailTo, charset));
-
- Transport.send(msg);
- return FormValidation.ok(Messages.Mailer_EmailSentSuccessfully());
- } catch (MessagingException e) {
- return FormValidation.errorWithMarkup(""+Messages.Mailer_FailedToSendEmail()+"
"+Util.escape(Functions.printThrowable(e))+"
");
- }
- }
-
- public boolean isApplicable(Class extends AbstractProject> jobType) {
- return true;
- }
- }
-
- /**
- * Per user property that is e-mail address.
- */
- public static class UserProperty extends hudson.model.UserProperty {
- /**
- * The user's e-mail address.
- * Null to leave it to default.
- */
- private final String emailAddress;
-
- public UserProperty(String emailAddress) {
- this.emailAddress = emailAddress;
- }
-
- @Exported
- public String getAddress() {
- if(hasExplicitlyConfiguredAddress())
- return emailAddress;
-
- // try the inference logic
- return MailAddressResolver.resolve(user);
- }
-
- /**
- * Has the user configured a value explicitly (true), or is it inferred (false)?
- */
- public boolean hasExplicitlyConfiguredAddress() {
- return Util.fixEmptyAndTrim(emailAddress)!=null;
- }
-
- @Extension
- public static final class DescriptorImpl extends UserPropertyDescriptor {
- public String getDisplayName() {
- return Messages.Mailer_UserProperty_DisplayName();
- }
-
- public UserProperty newInstance(User user) {
- return new UserProperty(null);
- }
-
- @Override
- public UserProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
- return new UserProperty(req.getParameter("email.address"));
- }
- }
- }
-
- /**
- * Debug probe point to be activated by the scripting console.
- */
- public static boolean debug = false;
-}
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index 020978cc81..392e73cf9b 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -395,6 +395,7 @@ public abstract class ProcessTree implements Iterable, IProcessTree,
Windows() {
for (final WinProcess p : WinProcess.all()) {
int pid = p.getPid();
+ if(pid == 0 || pid == 4) continue; // skip the System Idle and System processes
super.processes.put(pid,new OSProcess(pid) {
private EnvVars env;
private List args;
@@ -1227,4 +1228,4 @@ public abstract class ProcessTree implements Iterable, IProcessTree,
*/
public static boolean enabled = !Boolean.getBoolean(ProcessTreeKiller.class.getName()+".disable")
&& !Boolean.getBoolean(ProcessTree.class.getName()+".disable");
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/jenkins/model/GlobalConfiguration.java b/core/src/main/java/jenkins/model/GlobalConfiguration.java
index 5fd6a0818d..b6e873f952 100644
--- a/core/src/main/java/jenkins/model/GlobalConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalConfiguration.java
@@ -31,6 +31,15 @@ public abstract class GlobalConfiguration extends Descriptor
+ * To facilitate the separation of the global configuration into multiple pages, tabs, and so on,
+ * {@link GlobalConfiguration}s are classified into categories (such as "security", "tools", as well
+ * as the catch all "unclassified".) Categories themselves are extensible — plugins may introduce
+ * its own category as well, although that should only happen if you are creating a big enough subsystem.
+ *
+ *
+ * The primary purpose of this is to enable future UIs to split the global configurations to
+ * smaller pieces that can be individually looked at and updated.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 1.494
+ * @see GlobalConfiguration
+ */
+public abstract class GlobalConfigurationCategory implements ExtensionPoint, ModelObject {
+ /**
+ * One-line plain text message that explains what this category is about.
+ * This can be used in the UI to help the user pick the right category.
+ *
+ * The text should be longer than {@link #getDisplayName()}
+ */
+ public abstract String getShortDescription();
+
+ /**
+ * Returns all the registered {@link GlobalConfiguration} descriptors.
+ */
+ public static ExtensionList all() {
+ return Jenkins.getInstance().getExtensionList(GlobalConfigurationCategory.class);
+ }
+
+ public static T get(Class type) {
+ return all().get(type);
+ }
+
+ /**
+ * This category represents the catch-all I-dont-know-what-category-it-is instance,
+ * used for those {@link GlobalConfiguration}s that don't really deserve/need a separate
+ * category.
+ *
+ * Also used for backward compatibility. All {@link GlobalConfiguration}s without
+ * explicit category gets this as the category.
+ *
+ * In the current UI, this corresponds to the /configure link.
+ */
+ @Extension
+ public static class Unclassified extends GlobalConfigurationCategory {
+ @Override
+ public String getShortDescription() {
+ return jenkins.management.Messages.ConfigureLink_Description();
+ }
+
+ public String getDisplayName() {
+ return jenkins.management.Messages.ConfigureLink_DisplayName();
+ }
+ }
+
+ /**
+ * Security related configurations.
+ */
+ @Extension
+ public static class Security extends GlobalConfigurationCategory {
+ @Override
+ public String getShortDescription() {
+ return Messages.GlobalSecurityConfiguration_Description();
+ }
+
+ public String getDisplayName() {
+ return hudson.security.Messages.GlobalSecurityConfiguration_DisplayName();
+ }
+ }
+}
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a99ed5eca0..0109b58028 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -160,7 +160,6 @@ import hudson.slaves.OfflineCause;
import hudson.slaves.RetentionStrategy;
import hudson.tasks.BuildWrapper;
import hudson.tasks.Builder;
-import hudson.tasks.Mailer;
import hudson.tasks.Publisher;
import hudson.triggers.SafeTimerTask;
import hudson.triggers.Trigger;
@@ -1833,7 +1832,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
*/
public String getRootUrl() {
// for compatibility. the actual data is stored in Mailer
- String url = Mailer.descriptor().getUrl();
+ String url = JenkinsLocationConfiguration.get().getUrl();
if(url!=null) {
if (!url.endsWith("/")) url += '/';
return url;
diff --git a/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
new file mode 100644
index 0000000000..8431d20780
--- /dev/null
+++ b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
@@ -0,0 +1,110 @@
+package jenkins.model;
+
+import hudson.Extension;
+import hudson.Util;
+import hudson.XmlFile;
+import hudson.util.FormValidation;
+import net.sf.json.JSONObject;
+import org.kohsuke.stapler.QueryParameter;
+import org.kohsuke.stapler.StaplerRequest;
+
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Stores the location of Jenkins (e-mail address and the HTTP URL.)
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Extension
+public class JenkinsLocationConfiguration extends GlobalConfiguration {
+ /**
+ * @deprecated
+ */
+ private transient String hudsonUrl;
+ private String adminAddress;
+ private String jenkinsUrl;
+
+ public static JenkinsLocationConfiguration get() {
+ return GlobalConfiguration.all().get(JenkinsLocationConfiguration.class);
+ }
+
+ @Override
+ public synchronized void load() {
+ // for backward compatibility, if we don't have our own data yet, then
+ // load from Mailer.
+ XmlFile file = getConfigFile();
+ if(!file.exists()) {
+ file = new XmlFile(new File(Jenkins.getInstance().getRootDir(),"hudson.tasks.Mailer.xml"));
+ if (file.exists()) {
+ try {
+ file.unmarshal(this);
+ if (jenkinsUrl==null)
+ jenkinsUrl = hudsonUrl;
+ } catch (IOException e) {
+ LOGGER.log(Level.WARNING, "Failed to load "+file, e);
+ }
+ }
+ } else {
+ super.load();
+ }
+ }
+
+ public String getAdminAddress() {
+ String v = adminAddress;
+ if(v==null) v = Messages.Mailer_Address_Not_Configured();
+ return v;
+ }
+
+ public void setAdminAddress(String adminAddress) {
+ if(adminAddress.startsWith("\"") && adminAddress.endsWith("\"")) {
+ // some users apparently quote the whole thing. Don't konw why
+ // anyone does this, but it's a machine's job to forgive human mistake
+ adminAddress = adminAddress.substring(1,adminAddress.length()-1);
+ }
+ this.adminAddress = adminAddress;
+ save();
+ }
+
+ public String getUrl() {
+ return jenkinsUrl;
+ }
+
+ public void setUrl(String hudsonUrl) {
+ String url = Util.nullify(hudsonUrl);
+ if(url!=null && !url.endsWith("/"))
+ url += '/';
+ this.jenkinsUrl = url;
+ save();
+ }
+
+ @Override
+ public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+ req.bindJSON(this,json);
+ return true;
+ }
+
+ /**
+ * Checks the URL in global.jelly
+ */
+ public FormValidation doCheckUrl(@QueryParameter String value) {
+ if(value.startsWith("http://localhost"))
+ return FormValidation.warning(Messages.Mailer_Localhost_Error());
+ return FormValidation.ok();
+ }
+
+ public FormValidation doCheckAdminAddress(@QueryParameter String value) {
+ try {
+ new InternetAddress(value);
+ return FormValidation.ok();
+ } catch (AddressException e) {
+ return FormValidation.error(e.getMessage());
+ }
+ }
+
+ private static final Logger LOGGER = Logger.getLogger(JenkinsLocationConfiguration.class.getName());
+}
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
index fb13776304..bf2af43617 100644
--- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
+++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -502,7 +502,11 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
return search(n,Direction.EXACT);
}
- public final R put(R value) {
+ public R put(R value) {
+ return _put(value);
+ }
+
+ protected R _put(R value) {
return put(getNumberOf(value),value);
}
diff --git a/core/src/main/resources/hudson/cli/Messages.properties b/core/src/main/resources/hudson/cli/Messages.properties
index 6346b0b2ec..0a595b0c5c 100644
--- a/core/src/main/resources/hudson/cli/Messages.properties
+++ b/core/src/main/resources/hudson/cli/Messages.properties
@@ -27,6 +27,8 @@ ListChangesCommand.ShortDescription=\
Dumps the changelog for the specified build(s).
ListJobsCommand.ShortDescription=\
Lists all jobs in a specific view or item group.
+ListPluginsCommand.ShortDescription=\
+ Outputs a list of installed plugins.
LoginCommand.ShortDescription=\
Saves the current credential to allow future commands to run without explicit credential information.
LogoutCommand.ShortDescription=\
@@ -47,4 +49,4 @@ WhoAmICommand.ShortDescription=\
Reports your credential and permissions
UpdateJobCommand.ShortDescription=\
Updates the job definition XML from stdin. The opposite of the get-job command
-BuildCommand.CLICause.ShortDescription=Started by command line by {0}
\ No newline at end of file
+BuildCommand.CLICause.ShortDescription=Started by command line by {0}
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config.groovy b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config.groovy
deleted file mode 100644
index a9d988b0d2..0000000000
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/config.groovy
+++ /dev/null
@@ -1,21 +0,0 @@
-package hudson.security.GlobalSecurityConfiguration
-
-import hudson.security.SecurityRealm
-import hudson.security.AuthorizationStrategy
-
-def f=namespace(lib.FormTagLib)
-
-f.optionalBlock( field:"useSecurity", title:_("Enable security"), checked:app.useSecurity) {
- f.entry (title:_("TCP port for JNLP slave agents"), field:"slaveAgentPort") {
- f.serverTcpPort()
- }
-
- f.dropdownDescriptorSelector(title:_("Markup Formatter"),field:"markupFormatter")
-
- f.entry(title:_("Access Control")) {
- table(style:"width:100%") {
- f.descriptorRadioList(title:_("Security Realm"),varName:"realm", instance:app.securityRealm, descriptors:SecurityRealm.all())
- f.descriptorRadioList(title:_("Authorization"), varName:"authorization", instance:app.authorizationStrategy, descriptors:AuthorizationStrategy.all())
- }
- }
-}
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
new file mode 100644
index 0000000000..c9509baf0d
--- /dev/null
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
@@ -0,0 +1,60 @@
+package hudson.security.GlobalSecurityConfiguration
+
+import hudson.security.SecurityRealm
+import hudson.markup.MarkupFormatterDescriptor
+import hudson.security.AuthorizationStrategy
+import jenkins.model.GlobalConfiguration
+import hudson.Functions
+import hudson.model.Descriptor
+
+def f=namespace(lib.FormTagLib)
+def l=namespace(lib.LayoutTagLib)
+def st=namespace("jelly:stapler")
+
+l.layout(norefresh:true, permission:app.ADMINISTER, title:my.displayName) {
+ l.main_panel {
+ h1 {
+ img(src:"${imagesURL}/48x48/secure.png", height:48,width:48)
+ text(my.displayName)
+ }
+
+ p()
+ div(class:"behavior-loading", _("LOADING"))
+ f.form(method:"post",name:"config",action:"configure") {
+ set("instance",my);
+
+ f.optionalBlock( field:"useSecurity", title:_("Enable security"), checked:app.useSecurity) {
+ f.entry (title:_("TCP port for JNLP slave agents"), field:"slaveAgentPort") {
+ f.serverTcpPort()
+ }
+
+ f.dropdownDescriptorSelector(title:_("Markup Formatter"),descriptors: MarkupFormatterDescriptor.all(), field: 'markupFormatter')
+
+ f.entry(title:_("Access Control")) {
+ table(style:"width:100%") {
+ f.descriptorRadioList(title:_("Security Realm"),varName:"realm", instance:app.securityRealm, descriptors:SecurityRealm.all())
+ f.descriptorRadioList(title:_("Authorization"), varName:"authorization", instance:app.authorizationStrategy, descriptors:AuthorizationStrategy.all())
+ }
+ }
+ }
+
+ Functions.getSortedDescriptorsForGlobalConfig(my.FILTER).each { Descriptor descriptor ->
+ set("descriptor",descriptor)
+ set("instance",descriptor)
+ f.rowSet(name:descriptor.jsonSafeClassName) {
+ st.include(from:descriptor, page:descriptor.globalConfigPage)
+ }
+ }
+
+ f.block {
+ div(id:"bottom-sticker") {
+ div(class:"bottom-sticker-inner") {
+ f.submit(value:_("Save"))
+ f.apply()
+ }
+ }
+ }
+ }
+ }
+}
+
diff --git a/core/src/main/resources/hudson/security/Messages.properties b/core/src/main/resources/hudson/security/Messages.properties
index 9b4f54a01b..3ddab58365 100644
--- a/core/src/main/resources/hudson/security/Messages.properties
+++ b/core/src/main/resources/hudson/security/Messages.properties
@@ -19,6 +19,8 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
+GlobalSecurityConfiguration.DisplayName=Configure Global Security
+GlobalSecurityConfiguration.Description=Secure Jenkins; define who is allowed to access/use the system.
GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-based security
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.jelly b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.jelly
deleted file mode 100644
index d2b1064778..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.jelly
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.properties
deleted file mode 100644
index 6dfea47bf1..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-description=Your e-mail address, like joe.chin@sun.com
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_cs.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_cs.properties
deleted file mode 100644
index ca738ae2c4..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_cs.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ address=E-mailov\u00E1 adresa
-description=Va\u0161e E-mailov\u00E1 adresa, ve form\u00E1tu joe.chin@sun.com
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_es.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_es.properties
deleted file mode 100644
index fc65f83329..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_es.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-description=Tu dirección de correo. Ejemplo: joe.chin@sun.com
-E-mail\ address=Direccion de correo
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_it.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_it.properties
deleted file mode 100644
index 6fea41588f..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_it.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ address=Indirizzo e-mail
-description=Il tuo indirizzo email, ad esempio joe.chin@sun.com
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_ja.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_ja.properties
deleted file mode 100644
index ffee7ea01c..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_ja.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ address=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
-description=joe.chin@sun.com\u306E\u3088\u3046\u306A\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_lv.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_lv.properties
deleted file mode 100644
index a82c45481d..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_lv.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ address=E-pasta adrese
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_nb_NO.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_nb_NO.properties
deleted file mode 100644
index 617ccbe3e8..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_nb_NO.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ address=Epostadresse
-description=Din epostadresse, p\u00E5 formen joe.chin@sun.com
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_sv_SE.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_sv_SE.properties
deleted file mode 100644
index 2a93dcdcaf..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_sv_SE.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ address=E-postadress
-description=Din e-postadress, t.ex. joe.chin@sun.com
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_zh_TW.properties b/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_zh_TW.properties
deleted file mode 100644
index ea18498924..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_zh_TW.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ address=E-mail \u4FE1\u7BB1
-description=\u60A8\u7684 e-mail \u4FE1\u7BB1\uFF0C\u4F8B\u5982 joe.chin@sun.com
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config.jelly b/core/src/main/resources/hudson/tasks/Mailer/config.jelly
deleted file mode 100644
index a904d86142..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config.jelly
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config.properties b/core/src/main/resources/hudson/tasks/Mailer/config.properties
deleted file mode 100644
index 8abb553fa4..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-description=Whitespace-separated list of recipient addresses. May reference build \
- parameters like $PARAM. \
- E-mail will be sent when a build fails, becomes unstable or returns to stable.
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_bg.properties b/core/src/main/resources/hudson/tasks/Mailer/config_bg.properties
deleted file mode 100644
index a7ac14ce2a..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_bg.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=\u041F\u043E\u043B\u0443\u0447\u0430\u0442\u0435\u043B\u0438
-Send\ e-mail\ for\ every\ unstable\ build=\u0418\u0437\u043F\u0440\u0430\u0449\u0430\u0439 \u0438\u043C\u0435\u0439\u043B \u0437\u0430 \u0432\u0441\u0435\u043A\u0438 \u043D\u0435\u0441\u0442\u0430\u0431\u0438\u043B\u0435\u043D \u0431\u0438\u043B\u0434
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_da.properties b/core/src/main/resources/hudson/tasks/Mailer/config_da.properties
deleted file mode 100644
index 857e62d0be..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_da.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Send\ e-mail\ for\ every\ unstable\ build=Send e-mail for hvert ustabilt byg
-Recipients=Modtagere
-description=Mellemrumssepereret liste af modtageradresser. Kan benytte byggeparametre \
-s\u00e5ledes $PARAM. E-mail sendes n\u00e5r bygget fejler, bliver ustabilt eller bliver stabilt igen
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Send seperat E-mail til de individuelle brugere der kn\u00e6kkede bygget
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_de.properties b/core/src/main/resources/hudson/tasks/Mailer/config_de.properties
deleted file mode 100644
index 3d57d3070d..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_de.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=Empfänger
-description=Liste der Empfängeradressen, jeweils durch Leerzeichen getrennt. E-Mails werden versandt, wenn ein Build fehlschlägt.
-Send\ e-mail\ for\ every\ unstable\ build=E-Mails bei jedem instabilen Build senden
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Getrennte E-Mails an diejenigen Anwender senden, welche den Build fehlschlagen ließen
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_es.properties b/core/src/main/resources/hudson/tasks/Mailer/config_es.properties
deleted file mode 100644
index 5d494aecff..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_es.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-description=Lista de destinatarios separadas por un espacio en blanco. El correo será enviando siempre que una ejecución falle.
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Enviar correos individualizados a las personas que rompan el proyecto
-Send\ e-mail\ for\ every\ unstable\ build=Enviar correo para todos las ejecuciones con resultado inestable
-Recipients=Destinatarios
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_fr.properties b/core/src/main/resources/hudson/tasks/Mailer/config_fr.properties
deleted file mode 100644
index 8c75a08fa0..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_fr.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=Destinataires
-description=Liste des destinataires, séparés par un espace. Un email sera envoyé lors d''un échec d''un build.
-Send\ e-mail\ for\ every\ unstable\ build=Envoyer un email pour chaque build instable
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Envoyer des emails séparés aux personnes qui ont cassé le build
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_ja.properties b/core/src/main/resources/hudson/tasks/Mailer/config_ja.properties
deleted file mode 100644
index fdd8575644..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_ja.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=\u5b9b\u5148
-description=\u7a7a\u767d\u3067\u533a\u5207\u3063\u3066\u8907\u6570\u306e\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3067\u304d\u307e\u3059\u3002\u30e1\u30fc\u30eb\u306f\u30d3\u30eb\u30c9\u5931\u6557\u6642\u306b\u9001\u3089\u308c\u307e\u3059\u3002
-Send\ e-mail\ for\ every\ unstable\ build=\u4e0d\u5b89\u5b9a\u30d3\u30eb\u30c9\u3082\u9010\u4e00\u30e1\u30fc\u30eb\u3092\u9001\u4fe1
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=\u30d3\u30eb\u30c9\u3092\u58ca\u3057\u305f\u500b\u4eba\u306b\u3082\u5225\u9014\u30e1\u30fc\u30eb\u3092\u9001\u4fe1
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_nl.properties b/core/src/main/resources/hudson/tasks/Mailer/config_nl.properties
deleted file mode 100644
index 482312293d..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_nl.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=Geadresseerden
-description=Omschrijving
-Send\ e-mail\ for\ every\ unstable\ build=Zend een e-mail voor elke onstabiele bouwpoging.
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Zend, in geval van een gefaald bouwpoging, e-mails naar de personen die de laatste wijzigingen hebben aangebracht.
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_pl.properties b/core/src/main/resources/hudson/tasks/Mailer/config_pl.properties
deleted file mode 100644
index b950c4cc78..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_pl.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=Odbiorcy
-Send\ e-mail\ for\ every\ unstable\ build=Wy\u015Blij e-mail dla ka\u017Cdego niestabilnego buildu
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Wy\u015Blij osobne e-maile do os\u00F3b, kt\u00F3re wprowadzi\u0142y b\u0142\u0105d
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_pt_BR.properties b/core/src/main/resources/hudson/tasks/Mailer/config_pt_BR.properties
deleted file mode 100644
index f08141cbaf..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_pt_BR.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=Destinat\u00E1rios
-description=Lista de endere\u00e7os separados por espa\u00e7os em branco. E-mail ser\u00e1 enviado quando uma constru\u00e7\u00e3o falhar.
-Send\ e-mail\ for\ every\ unstable\ build=Enviar e-mail para todas as constru\u00e7\u00f5es inst\u00e1veis
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Enviar e-mails separados para os indiv\u00edduos que danificaram a constru\u00e7\u00e3o
-
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_ru.properties b/core/src/main/resources/hudson/tasks/Mailer/config_ru.properties
deleted file mode 100644
index b523518b32..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_ru.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Recipients=\u041f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438
-description=\u0421\u043f\u0438\u0441\u043e\u043a \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439, \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0445 \u043f\u0440\u043e\u0431\u0435\u043b\u0430\u043c\u0438. \u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043e, \u0435\u0441\u043b\u0438 \u0441\u0431\u043e\u0440\u043a\u0430 \u043f\u0440\u043e\u0432\u0430\u043b\u0438\u0442\u0441\u044f.
-Send\ e-mail\ for\ every\ unstable\ build=\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u043e \u043d\u0435\u0441\u0442\u0430\u0431\u0438\u043b\u044c\u043d\u044b\u0445 \u0441\u0431\u043e\u0440\u043a\u0430\u0445
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0430\u043c, \u0447\u044c\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432\u044b\u0437\u0432\u0430\u043b\u0438 \u043f\u043e\u043b\u043e\u043c\u043a\u0443.
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_tr.properties b/core/src/main/resources/hudson/tasks/Mailer/config_tr.properties
deleted file mode 100644
index 79aff1d363..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_tr.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-description=Al\u0131c\u0131 adresleri bo\u015fluk karakteri ile ayr\u0131lmal\u0131d\u0131r. Yap\u0131land\u0131rma ba\u015far\u0131s\u0131z oldu\u011funda e-posta g\u00f6nderilecektir.
-Recipients=Al\u0131c\u0131lar
-Send\ e-mail\ for\ every\ unstable\ build=Her dengesiz yap\u0131land\u0131rmada e-posta g\u00f6nder
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=Yap\u0131land\u0131rmay\u0131 bozan t\u00fcm bireylere ayr\u0131 e-posta g\u00f6nder
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config_zh_CN.properties b/core/src/main/resources/hudson/tasks/Mailer/config_zh_CN.properties
deleted file mode 100644
index 3806ba92ab..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/config_zh_CN.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Send\ e-mail\ for\ every\ unstable\ build=\u6BCF\u6B21\u4E0D\u7A33\u5B9A\u7684\u6784\u5EFA\u90FD\u53D1\u9001\u90AE\u4EF6\u901A\u77E5
-Send\ separate\ e-mails\ to\ individuals\ who\ broke\ the\ build=\u5355\u72EC\u53D1\u9001\u90AE\u4EF6\u7ED9\u5BF9\u6784\u5EFA\u9020\u6210\u4E0D\u826F\u5F71\u54CD\u7684\u8D23\u4EFB\u4EBA
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global.jelly b/core/src/main/resources/hudson/tasks/Mailer/global.jelly
deleted file mode 100644
index b273d5b7a2..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global.jelly
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_da.properties b/core/src/main/resources/hudson/tasks/Mailer/global_da.properties
deleted file mode 100644
index f121253c14..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_da.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Password=Adgangskode
-E-mail\ Notification=E-mail p\u00e5mindelser
-Default\ user\ e-mail\ suffix=Standard e-mail endelse
-Use\ SSL=Brug SSL
-SMTP\ Port=SMTP Port
-Use\ SMTP\ Authentication=Benyt SMTP Authentificering
-SMTP\ server=SMTP Server
-User\ Name=Brugernavn
-System\ Admin\ E-mail\ Address=Systemadministratorens E-mail adresse
-Charset=Karakters\u00e6t
-Test\ configuration\ by\ sending\ e-mail=Test konfigurationen ved at sende en e-mail
-Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_de.properties b/core/src/main/resources/hudson/tasks/Mailer/global_de.properties
deleted file mode 100644
index b20a803d0c..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_de.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=E-Mail Benachrichtigung
-Test\ configuration\ by\ sending\ test\ e-mail=E-Mail versenden, um Konfiguration zu testen
-SMTP\ server=SMTP-Server
-Default\ user\ e-mail\ suffix=Standardendung f\u00FCr E-Mail-Adressen
-Sender\ E-mail\ Address=Absenderadresse
-System\ Admin\ E-mail\ Address=E-Mail-Adresse des Systemadministrators
-Jenkins\ URL=Jenkins URL
-User\ Name=Benutzername
-Password=Kennwort
-Use\ SSL=SSL verwenden
-Use\ SMTP\ Authentication=Verwende SMTP Authentifizierung
-SMTP\ Port=SMTP-Port
-Charset=Zeichensatz
-Reply-To\ Address=Antwortadresse
-Test\ e-mail\ recipient=Test E-Mail Empfänger
-Test\ configuration=Konfiguration testen
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_es.properties b/core/src/main/resources/hudson/tasks/Mailer/global_es.properties
deleted file mode 100644
index 2e796edd7b..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_es.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=Notificación por correo electrónico
-SMTP\ server=Servidor de correo saliente (SMTP)
-Default\ user\ e-mail\ suffix=sufijo de email por defecto
-Jenkins\ URL=Dirección web de Jenkins
-Use\ SMTP\ Authentication=Usar autenticación SMTP
-User\ Name=Nombre de usuario
-Password=Contrase\u00F1a
-Use\ SSL=Usar seguridad SSL
-SMTP\ Port=Puerto de SMTP
-Charset=Juego de caracteres
-Test\ configuration\ by\ sending\ test\ e-mail=Probar la configuración enviando un correo de prueba
-Reply-To\ Address=Dirección para la respuesta
-Test\ e-mail\ recipient=Dirección para el correo de prueba
-Sender\ E-mail\ Address=Dirección de remitente
-Test\ configuration=Configuración de pruebas
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_fr.properties b/core/src/main/resources/hudson/tasks/Mailer/global_fr.properties
deleted file mode 100644
index ea89fcfd0b..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_fr.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=Notification par email
-Test\ configuration=Tester la configuration
-Test\ configuration\ by\ sending\ e-mail=Tester la configuration en envoyant un email
-Test\ configuration\ by\ sending\ test\ e-mail=Tester la configuration en envoyant un e-mail de test
-Test\ e-mail\ recipient=Destinataire du courriel de test
-SMTP\ server=Serveur SMTP
-Charset=Jeu de caract\u00e8res
-Default\ user\ e-mail\ suffix=Suffixe par d\u00E9faut des emails des utilisateurs
-Sender\ E-mail\ Address=Adresse e-mail de l''''exp\u00E9diteur
-System\ Admin\ E-mail\ Address=Adresse email de l''administrateur syst\u00cbme
-Jenkins\ URL=URL de Jenkins
-User\ Name=Nom d''utilisateur
-Password=Mot de passe
-Use\ SSL=Utiliser SSL
-Use\ SMTP\ Authentication=Utiliser l''authentification par SMTP
-SMTP\ Port=Port SMTP
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_ko.properties b/core/src/main/resources/hudson/tasks/Mailer/global_ko.properties
deleted file mode 100644
index f25ab82793..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_ko.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=E-mail\uB85C \uC54C\uB824\uC90C
-Password=\uBE44\uBC00\uBC88\uD638
-SMTP\ server=SMTP \uC11C\uBC84
-Use\ SSL=SSL \uC0AC\uC6A9
-User\ Name=\uC0AC\uC6A9\uC790\uBA85
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_nl.properties b/core/src/main/resources/hudson/tasks/Mailer/global_nl.properties
deleted file mode 100644
index 33375b33de..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_nl.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=E-mail
-Test\ configuration\ by\ sending\ e-mail=Test configuratie door een e-mail te versturen
-SMTP\ Port=SMTP Poort
-SMTP\ server=SMTP server
-Default\ user\ e-mail\ suffix=Standaard e-mail suffix
-System\ Admin\ E-mail\ Address=E-mail systeemadministrator
-Jenkins\ URL=Jenkins URL
-User\ Name=Naam gebruiker
-Password=Paswoord
-Use\ SMTP\ Authentication=Gebruik SMTP Authenticatie
-Use\ SSL=Gebruik SSL
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_pt_BR.properties b/core/src/main/resources/hudson/tasks/Mailer/global_pt_BR.properties
deleted file mode 100644
index f15b50a4b2..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_pt_BR.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=Notifica\u00e7\u00e3o de E-mail
-Test\ configuration\ by\ sending\ e-mail=Configura\u00e7\u00e3o de teste para enviar e-mail
-SMTP\ server=Servidor SMTP
-Default\ user\ e-mail\ suffix=Sufixo padr\u00e3o para e-mail de usu\u00e1rio
-System\ Admin\ E-mail\ Address=Endere\u00e7o de E-mail do Administrador do Sistema
-Jenkins\ URL=URL do Jenkins
-User\ Name=Nome do Usu\u00e1rio
-Password=Senha
-Use\ SSL=Usar SSL
-SMTP\ Port=Porta SMTP
-Use\ SMTP\ Authentication=Usar autentica\u00e7\u00e3o SMTP
-Charset=Charset
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_ru.properties b/core/src/main/resources/hudson/tasks/Mailer/global_ru.properties
deleted file mode 100644
index 634a8e42b8..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_ru.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u043e\u0439
-Test\ configuration\ by\ sending\ e-mail=\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u043e\u0439 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443
-SMTP\ Port=\u041f\u043e\u0440\u0442 SMTP
-SMTP\ server=\u0421\u0435\u0440\u0432\u0435\u0440 SMTP
-Default\ user\ e-mail\ suffix=\u0421\u0443\u0444\u0444\u0438\u043a\u0441 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e
-System\ Admin\ E-mail\ Address=\u0410\u0434\u0440\u0435\u0441 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
-Jenkins\ URL=Jenkins URL
-User\ Name=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
-Password=\u041f\u0430\u0440\u043e\u043b\u044c
-Use\ SSL=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c SSL
-Use\ SMTP\ Authentication=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e \u0434\u043b\u044f SMTP
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_tr.properties b/core/src/main/resources/hudson/tasks/Mailer/global_tr.properties
deleted file mode 100644
index 0c055259ef..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_tr.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=E-posta Bilgilendirmesi
-Test\ configuration\ by\ sending\ e-mail=atarak konfig\u00fcrasyonu test et
-SMTP\ server=SMTP\ sunucusu
-Default\ user\ e-mail\ suffix=Varsay\u0131lan kullan\u0131c\u0131 e-posta soneki
-System\ Admin\ E-mail\ Address=Sistem\ Admin\ e-posta\ Adresi
-Jenkins\ URL=Jenkins\ URL'i
-User\ Name=Kullan\u0131c\u0131\ ad\u0131
-Password=\u015fifre
-Use\ SSL=SSL\ kullan
-Use\ SMTP\ Authentication=SMTP Kimlik Denetimini kullan
-SMTP\ Port=SMTP Portu
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_zh_CN.properties b/core/src/main/resources/hudson/tasks/Mailer/global_zh_CN.properties
deleted file mode 100644
index 661b13b529..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_zh_CN.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-E-mail\ Notification=\u90ae\u4ef6\u901a\u77e5
-Test\ configuration\ by\ sending\ e-mail=\u7528\u7cfb\u7edf\u7ba1\u7406\u5458\u6d4b\u8bd5\u90ae\u4ef6\u914d\u7f6e
-SMTP\ server=SMTP\u670d\u52a1\u5668
-Charset=\u5B57\u7B26\u96C6
-Default\ user\ e-mail\ suffix=\u7528\u6237\u9ed8\u8ba4\u90ae\u4ef6\u540e\u7f00
-Sender\ E-mail\ Address=\u53D1\u9001\u8005\u7684\u90AE\u7BB1\u5730\u5740
-System\ Admin\ E-mail\ Address=\u7cfb\u7edf\u7ba1\u7406\u5458\u90ae\u4ef6\u5730\u5740
-Jenkins\ URL=Jenkins URL
-User\ Name=\u7528\u6237\u540d
-Password=\u5bc6\u7801
-Use\ SSL=\u4f7f\u7528SSL\u534f\u8bae
-Test\ configuration\ by\ sending\ test\ e-mail=\u901A\u8FC7\u53D1\u9001\u6D4B\u8BD5\u90AE\u4EF6\u6D4B\u8BD5\u914D\u7F6E
-Use\ SMTP\ Authentication=\u4f7f\u7528SMTP\u8ba4\u8bc1
-SMTP\ Port=SMTP\u7aef\u53e3
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_zh_TW.properties b/core/src/main/resources/hudson/tasks/Mailer/global_zh_TW.properties
deleted file mode 100644
index 0403fbcbb6..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/global_zh_TW.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Password=\u5BC6\u78BC
-User\ Name=\u4F7F\u7528\u8005\u540D\u5B57
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix.html
deleted file mode 100644
index 6e7ae84e10..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- If your users' e-mail addresses can be computed automatically by simply adding a suffix,
- then specify that suffix. Otherwise leave it empty. Note that users can always override
- the e-mail address selectively. For example, if this field is set to @acme.org,
- then user foo will by default get the e-mail address foo@acme.org
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_de.html
deleted file mode 100644
index ce3950ee12..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_de.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- Falls die E-Mail-Adressen der Benutzer systematisch durch Anhängen eines Suffixes
- gebildet werden können, geben Sie hier den Suffix an. Andernfalls lassen Sie
- das Feld frei. Beachten Sie, das Benutzer ihre E-Mail-Adressen trotzdem selektiv
- überschreiben können.
-
- Beispiel: Steht in diesem Feld @acme.org, wird dem Benutzer foo
- automatisch die E-Mail-Adresse foo@acme.org zugeordnet.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_fr.html
deleted file mode 100644
index 0d245ef2b8..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_fr.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
- Si les adresses email de vos utilisateurs peuvent être obtenues
- automatiquement simplement en ajoutant un suffixe, alors spécifiez ce
- suffixe ici.
- Sinon, laissez ce champ vide.
- Notez que les utilisateurs peuvent toujours changer ce comportement de
- façon sélective.
- Par exemple, si ce champ est valorisé à @acme.org,
- alors l'utilisateur foo aura par défaut l'adresse email
- foo@acme.org.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ja.html
deleted file mode 100644
index f662efe314..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ja.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- ユーザーのE-mailアドレスが、単に(ユーザー名などに)サフィックスを追加するだけなら、
- そのサフィックスを指定します。
- そうでなければ、空欄のままにします。ユーザーのメールアドレスは必ず上書きされることに気をつけてください。
- 例えば、この項目に@acme.orgを設定すると、
- ユーザ ーfoo のメールアドレスは、foo@acme.orgになります。
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_nl.html
deleted file mode 100644
index cecda1f29d..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_nl.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- Indien de e-mail adressen van uw gebruikers eenvoudig afgeleid kunnen worden door toevoeging
- van een suffix, kunt u deze suffix hier opgeven. Gelieve dit veld leeg te laten indien dit niet
- mogelijk is.
- Bemerk dat gebruiker steeds hun eigen e-mail adres kunnen instellen bij hun gebruikerspagina.
- Bvb. indien u in dit veld @acme.org invult, dan zal de gebruiker foo standaard
- via het e-mail adres foo@acme.org gecontacteerd worden.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_pt_BR.html
deleted file mode 100644
index 9ecdde3a9a..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Se os endereços de e-mails de usuários puderem ser computados automaticamente simplesmente adicionando um sufixo,
- então especifique este sufixo. Caso contrário deixe-o em branco. Note que os usuários podem sempre sobrescrever
- o endereço de e-mail seletivamente. Por exemplo, se este campo contiver @acme.org,
- então o usuário foo por padrão terá o endereço de e-mail foo@acme.org
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ru.html
deleted file mode 100644
index 7c49975d15..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_ru.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Если адреса ваших пользователей могут быть вычислены автоматически добавлением суффикса,
- тогда укажите этот суффикс. Иначе, оставьте поле пустым. Заметьте, что пользователи
- в любой момент могут вручную поменять свой адрес в настройках.
- Например, если значение поля @acme.org,
- то пользователь mike по умолчанию получит адрес mike@acme.org.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_tr.html
deleted file mode 100644
index 567abbad88..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_tr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- Eğer kullanıcıların e-posta adresleri, sonek eklenerek kolaylıkla oluşturulabiliyorsa,
- bu soneki buraya yazabilirsiniz. Aksi takdirde boş bırakın. Unutmayın, kullanıcılar, isterlerse
- e-posta adreslerini düzenleyebilirler.
-
- Örnek verecek olursak, bu kısıma @acme.org yazarsanız, foo kullanıcısının
- e-posta adresine, varsayılan değer olarak, foo@acme.org atanacaktır.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_zh_CN.html b/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_zh_CN.html
deleted file mode 100644
index 7f9fd08b72..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-defaultSuffix_zh_CN.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- 如果用户邮件能够自动的指定后缀,那么在此处填写后缀.否则不用填写.注意,用户可以选择性的覆盖邮件地址.
- 例如,如果这里设定了@acme.org,那么用户foo的默认邮件地址为foo@acme.org
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort.html
deleted file mode 100644
index 230d846ed4..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Port number for the mail server. Leave it empty to use the default port for the protocol.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_de.html
deleted file mode 100644
index 33b5dbf9d1..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_de.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- Portnummer des Mail-Servers. Lassen Sie das Feld frei, um den Standardport
- des Protokolls zu verwenden.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_fr.html
deleted file mode 100644
index a9873d7386..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_fr.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Le numéro de port du serveur mail. Laissez vide pour utiliser le numéro de port par défaut du protocole.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_ja.html
deleted file mode 100644
index c548b1417a..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_ja.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- メールサーバーのポート番号です。空欄のままにすると、プロトコルのデフォルトポート番号を使用します。
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_nl.html
deleted file mode 100644
index 13bff19ed6..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_nl.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Poortnummer voor de mail server. Laat dit leeg indien je de standaard smtp poort wenst te gebruiken.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_tr.html
deleted file mode 100644
index da4ac322e4..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_tr.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- E-posta sunucusu için port numarası. Bu protokol için varsayılan portu kullanmak istiyorsanız, boş bırakabilirsiniz.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_zh_CN.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_zh_CN.html
deleted file mode 100644
index fb89914a97..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpPort_zh_CN.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- 邮件服务器端口号.不填写此项将使用协议默认端口.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer.html
deleted file mode 100644
index 16d598871d..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
- Name of the mail server. Leave it empty to use the default server
- (which is normally the one running on localhost).
-
-
- Jenkins uses JavaMail for sending out e-mails, and JavaMail allows
- additional settings to be given as system properties to the container.
- See
- this document for possible values and effects.
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_de.html
deleted file mode 100644
index 68d4bd4b53..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_de.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
- Name des SMTP-Mail-Servers. Lassen Sie das Feld frei, um den Standardserver
- zu verwenden (normalerweise der Server, der auf localhost läuft).
-
-
-
- Jenkins verwendet JavaMail, um E-Mails zu verschicken. JavaMail unterstützt
- zusätzliche Einstellungen, die als Systemeigenschaften dem Container
- übergeben werden können
- (Liste mit möglichen Werten und deren Auswirkungen).
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_fr.html
deleted file mode 100644
index 058271bd0c..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_fr.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
- Le nom du serveur de mail. Laissez ce champ vide pour utiliser le serveur
- par défaut (qui est normalement celui qui tourne sur localhost).
-
-
- Jenkins utilise JavaMail pour envoyer des emails et JavaMail propose des
- options supplémentaires à passer comme propriétés système au conteneur.
- Voir
- ce document pour avoir une idée des valeurs et des comportements
- possibles.
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ja.html
deleted file mode 100644
index 91bdfa3f59..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ja.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- メールサーバーの名前を設定します。
- 空欄のままにすると、デフォルトのサーバー(ローカルホストで動作している)を使用します。
-
-
- Jenkinsはメールの送信にJavaMailを使用しますが、追加の設定をコンテナにシステムプロパティとして設定することができます。
- 設定できる値と効果は、
- このドキュメントを参照してください。
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_nl.html
deleted file mode 100644
index 4bd217973f..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_nl.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
- Naam van de mail server. Laat dit leeg indien U de standaard server gebruikt.
- (De standaard server is normaal diegene die op localhost actief is.)
-
-
- Jenkins gebruikt JavaMail voor het uitzenden van e-mails. JavaMail maakt het
- mogelijk om extra instellingen via de systeemparameters aan de container door
- te geven.
- Zie
- dit document voor mogelijke waarden en gebruik.
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_pt_BR.html
deleted file mode 100644
index b14958f3d5..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_pt_BR.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
- Nome do servidor de SMTP. Deixe em branco para usar o servidor padrão
- (que normalmente está executando em localhost).
-
-
- O Jenkins usa o JavaMail para envier e-mails, e o JavaMail permite
- que configurações adicionais sejam passadas como propriedades do sistema para o container.
- Veja
- esta documentação para possíveis valores e efeitos.
-
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ru.html
deleted file mode 100644
index 73aaa582d9..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_ru.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
- Доменное имя почтового сервера. Оставьте пустым для использования
- сервера по-умолчанию (обычно это тот сервер запущен на localhost).
-
-
- Jenkins использует JavaMail для отправки почты. JavaMail имеет возможность
- дополнительной настройки через системные свойства установленные в контейнере.
- Смотрите
-
- документ для полного списка параметров и их описаний.
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_tr.html
deleted file mode 100644
index f75cb12e7c..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_tr.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- Mail sunucusunun adıdır. Varsayılan sunucuyu (localhost'tan çalışan) kullanmak için boş bırakın.
-
-
- Jenkins e-posta gönderirken JavaMail kullanır, ve JavaMail, container'a,
- bazı ek ayarların sistem özelliği olarak geçirilebilmesini sağlar.
- Bu konu ile ilgili bu dokümanı okuyabilirsiniz.
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_zh_CN.html b/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_zh_CN.html
deleted file mode 100644
index 89c1be4a50..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-smtpServer_zh_CN.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- 邮件服务器的名称.不填此项则使用默认服务器
- (默认服务器通常是运行在本地)
-
-
- Jenkins使用JavaMail发送e-mail,JavaMail允许使用容器系统参数进行附加设置.
- 请参阅
- 这个文档查找可用到的值.
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl.html
deleted file mode 100644
index dfab1223fa..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- Whether or not to use SSL for connecting to the SMTP server. Defaults to port 465.
-
-
- Other advanced configurations can be done by setting system properties.
- See
- this document for possible values and effects.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_de.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_de.html
deleted file mode 100644
index 6492473c36..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_de.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_fr.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_fr.html
deleted file mode 100644
index e0f574a9f2..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_fr.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
- Indique si SSL doit être utilisé pour la connexion au serveur SMTP.
- Le port par défaut est le 465.
-
-
- D'autres configurations avancées peuvent être faites en positionnant des
- propriétés système.
- Voir
- ce document pour avoir une idée des valeurs et des comportements
- possibles.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ja.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ja.html
deleted file mode 100644
index 774a690fb9..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ja.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- SMTPサーバーとの接続にSSLを使用するか否かを設定します。デフォルトのポートは465です。
-
-
- 高度な設定は、システムプロパティの設定で可能です。
- 設定可能な値と効果は、
- このドキュメントを参照してください。
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_nl.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_nl.html
deleted file mode 100644
index 6025d77e60..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_nl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
- Wenst U SSL te gebruiken bij het connectern naar uw SMTP server. Hiervoor wordt
- standaard poort 465 gebruikt.
-
-
- Meer geavanceerde configuratie kan via het instellen van systeemparameters gerealizeerd
- worden.
- Zie
- dit document voor mogelijke waarden en gebruik.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_pt_BR.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_pt_BR.html
deleted file mode 100644
index 05a4e3db25..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_pt_BR.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- Se para usar ou não SSL para conectar-se ao servidor de SMTP. O padrão aponta para porta 465.
-
-
- Outras configurações avançadas podem ser feitas configurando as propriedades dos sistema.
- Veja
- esta documentação para possíveis valores e efeitos.
-
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ru.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ru.html
deleted file mode 100644
index 5d5f80b01d..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_ru.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- Использовать ли SSL для соединения с SMTP сервером. По-умолчанию используется порт 465.
-
-
- Прочие расширенные настройки для отправки сообщений могут быть изменены
- с помощью системных параметров. Смотрите
-
- этот документ для подробной информации.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_tr.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_tr.html
deleted file mode 100644
index a899887581..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_tr.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- SMTP sunucusuna, SSL ile bağlanılıp bağlanılmayacağı bilgisidir. Varsayılan port numarası 465'tir.
-
-
- Diğer gelişmiş konfigürasyonlar, sistem özellikleri ayarlanarak yapılabilir.
- Bununla ilgili bu dokümanı okuyabilirsiniz.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_zh_CN.html b/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_zh_CN.html
deleted file mode 100644
index 9fd7a1d6e9..0000000000
--- a/core/src/main/resources/hudson/tasks/Mailer/help-useSsl_zh_CN.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- 如论SMTP服务器是否使用SSL连接.默认端口都是465.
-
-
- 更高级的配置可以通过设置系统参数来完成.
- 参考这个文档了解更多信息.
-
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/Messages.properties b/core/src/main/resources/hudson/tasks/Messages.properties
index 3612c00635..3f61827ddc 100644
--- a/core/src/main/resources/hudson/tasks/Messages.properties
+++ b/core/src/main/resources/hudson/tasks/Messages.properties
@@ -72,30 +72,6 @@ JavadocArchiver.NoMatchFound=No javadoc found in {0}: {1}
JavadocArchiver.Publishing=Publishing Javadoc
JavadocArchiver.UnableToCopy=Unable to copy Javadoc from {0} to {1}
-MailSender.ListEmpty=An attempt to send an e-mail to empty list of recipients, ignored.
-MailSender.NoAddress=Failed to send e-mail to {0} because no e-mail address is known, and no default e-mail domain is configured
-MailSender.BackToNormal.Normal=normal
-MailSender.BackToNormal.Stable=stable
-MailSender.BackToNormalMail.Subject=Jenkins build is back to {0} :
-MailSender.UnstableMail.Subject=Jenkins build is unstable:
-MailSender.UnstableMail.ToUnStable.Subject=Jenkins build became unstable:
-MailSender.UnstableMail.StillUnstable.Subject=Jenkins build is still unstable:
-MailSender.FailureMail.Subject=Build failed in Jenkins:
-MailSender.FailureMail.Changes=Changes:
-MailSender.FailureMail.FailedToAccessBuildLog=Failed to access build log
-MailSender.Link=See <{0}{1}>
-
-Mailer.DisplayName=E-mail Notification
-Mailer.Unknown.Host.Name=Unknown host name:
-Mailer.Suffix.Error=This field should be ''@'' followed by a domain name.
-Mailer.Address.Not.Configured=address not configured yet
-Mailer.Localhost.Error=Please set a valid host name, instead of localhost
-Mailer.UserProperty.DisplayName=E-mail
-Mailer.EmailSentSuccessfully=Email was successfully sent
-Mailer.FailedToSendEmail=Failed to send out e-mail
-Mailer.TestMail.Subject=Test email #{0}
-Mailer.TestMail.Content=This is test email #{0} sent from {1}
-
Maven.DisplayName=Invoke top-level Maven targets
Maven.ExecFailed=command execution failed
Maven.NotMavenDirectory={0} doesn''t look like a Maven directory
diff --git a/core/src/main/resources/hudson/tasks/Messages_da.properties b/core/src/main/resources/hudson/tasks/Messages_da.properties
index 475082d754..8013fdbaa7 100644
--- a/core/src/main/resources/hudson/tasks/Messages_da.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_da.properties
@@ -24,66 +24,45 @@ BuildTrigger.DisplayName=Byg andre projekter
JavadocArchiver.Publishing=Publicerer Javadoc
ArtifactArchiver.ARCHIVING_ARTIFACTS=Arkiverer artifakter
Maven.NotMavenDirectory={0} ligner ikke et Maven direktorie
-Fingerprinter.NoArchiving=Der b\u00f8r opsamles filfingeraftryk p\u00e5 Byggeartifakter, men byggeartifakter er ikke sl\u00e5et til
+Fingerprinter.NoArchiving=Der b\u00F8r opsamles filfingeraftryk p\u00E5 Byggeartifakter, men byggeartifakter er ikke sl\u00E5et til
Ant.NotADirectory={0} er ikke et direktorie
Fingerprinter.FailedFor=Kunne ikke opsamle filfingeraftryk for {0}
-Mailer.Address.Not.Configured=Adresse ikke konfigureret
JavadocArchiver.DisplayName=Publicer Javadoc
-Mailer.UserProperty.DisplayName=E-mail
Maven.ExecFailed=Kommando eksekvering fejlede
-BuildTrigger.InQueue={0} er allerede i k\u00f8en
-MailSender.UnstableMail.Subject=Jenkins bygget er ustabilt:
-ArtifactArchiver.NoIncludes=\
-Ingen artifakter vil blive arkiveret. \n\
-Du har formentlig glemt at s\u00e6tte film\u00f8nsteret, g\u00e5 til konfigurationen og specificer dette.\n\
-Hvis du virkelig mener at du vil arkivere alle filer i arbejdsomr\u00e5det, benyt da "**"
+BuildTrigger.InQueue={0} er allerede i k\u00F8en
+ArtifactArchiver.NoIncludes=Ingen artifakter vil blive arkiveret. \nDu har formentlig glemt at s\u00E6tte film\u00F8nsteret, g\u00E5 til konfigurationen og specificer dette.\nHvis du virkelig mener at du vil arkivere alle filer i arbejdsomr\u00E5det, benyt da "**"
CommandInterpreter.UnableToDelete=Kan ikke slette skriptfilen {0}
-Ant.GlobalConfigNeeded=M\u00e5ske mangler du at konfigurere hvor dine Ant installationer er?
+Ant.GlobalConfigNeeded=M\u00E5ske mangler du at konfigurere hvor dine Ant installationer er?
InstallFromApache=Installer fra Apache
-MailSender.UnstableMail.ToUnStable.Subject=Jenkins bygget er blevet ustabilt:
-MailSender.ListEmpty=Fors\u00f8g p\u00e5 at sende mail til en tom modtagerliste ignoreret.
-Ant.ProjectConfigNeeded=M\u00e5ske mangler du at konfigurere jobbet til at v\u00e6lge en af dine Ant installationer?
+Ant.ProjectConfigNeeded=M\u00E5ske mangler du at konfigurere jobbet til at v\u00E6lge en af dine Ant installationer?
ArtifactArchiver.DisplayName=Arkiver artifakterne
Ant.NotAntDirectory={0} ligner ikke et Ant direktorie
Fingerprinter.DigestFailed=Kunne ikke beregne filfingeraftryk for {0}
CommandInterpreter.UnableToProduceScript=Ude af stand til at lave en skriptfil
-MailSender.BackToNormalMail.Subject=Jenkins bygget er tilbage til {0} :
-Shell.DisplayName=K\u00f8r skalkommando
+Shell.DisplayName=K\u00F8r skalkommando
BuildTrigger.NotBuildable={0} kan ikke bygges
-Mailer.DisplayName=E-mail p\u00e5mindelse
JavadocArchiver.DisplayName.Generic=Dokument
Ant.ExecFailed=Kommandoeksekvering fejlede
-Ant.DisplayName=K\u00f8r Ant
-MailSender.BackToNormal.Normal=normal
-MailSender.UnstableMail.StillUnstable.Subject=Jenkins bygget er stadig ustabilt:
-MailSender.Link=Se <{0}{1}>
+Ant.DisplayName=K\u00F8r Ant
BuildTrigger.Triggering=Starter et nyt byg af {0}
-Maven.DisplayName=K\u00f8r top-niveau Maven m\u00e5l
-ArtifactArchiver.NoMatchFound=Ingen artifakter matcher film\u00f8nsteret "{0}". Konfigurationsfejl?
-Mailer.Suffix.Error=Dette felt b\u00f8r v\u00e6re ''@'' efterfulgt af et dom\u00e6nenavn
+Maven.DisplayName=K\u00F8r top-niveau Maven m\u00E5l
+ArtifactArchiver.NoMatchFound=Ingen artifakter matcher film\u00F8nsteret "{0}". Konfigurationsfejl?
Fingerprinter.Aborted=Afbrudt
-Mailer.Localhost.Error=Venligst inds\u00e6t et gyldigt v\u00e6rtsnavn, istedet for localhost
Fingerprinter.DisplayName=Tag filfingeraftryk af filer for at spore brugen af disse
-Mailer.Unknown.Host.Name=Ukendt v\u00e6rtsnavn:
JavadocArchiver.DisplayName.Javadoc=Javadoc
TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc
-MailSender.FailureMail.Changes=\u00c6ndringer
-MailSender.FailureMail.FailedToAccessBuildLog=Kunne ikke tilg\u00e5 byggeloggen
Ant.ExecutableNotFound=Kan ikke finde en eksekverbar fra den valgte Ant installation "{0}"
-BatchFile.DisplayName=K\u00f8r Windows batch kommando
+BatchFile.DisplayName=K\u00F8r Windows batch kommando
JavadocArchiver.UnableToCopy=Ude af stand til at kopiere Javadoc fra {0} til {1}
JavadocArchiver.NoMatchFound=Ingen Javadoc fundet i {0}: {1}
Maven.NoExecutable=Kunne ikke finde en eksekverbar i {0}
-BuildTrigger.NoSuchProject=Intet s\u00e5kaldt projekt ''{0}''. Mente du ''{1}''?
-MailSender.BackToNormal.Stable=Stabil
-MailSender.NoAddress=Kunne ikke sende en e-mail til {0}, da e-mail adressen ikke er kendt og intet standard e-mail dom\u00e6ne er konfigureret
+BuildTrigger.NoSuchProject=Intet s\u00E5kaldt projekt ''{0}''. Mente du ''{1}''?
Fingerprinter.Action.DisplayName=Se Filfingeraftryk
ArtifactArchiver.FailedToArchive=Fejlede under arkivering af artifakter: {0}
Maven.NotADirectory={0} er ikke et direktorie
-BuildTrigger.Disabled={0} er sl\u00e5et fra, starter ikke
+BuildTrigger.Disabled={0} er sl\u00E5et fra, starter ikke
Fingerprinter.Recording=Opsamler filfingeraftryk
CommandInterpreter.CommandFailed=Kommandoeksekvering fejlede
-Fingerprinter.NoWorkspace=Ude af stand til at opsamle filfingeraftryk, da der ikke er et arbejdsomr\u00e5de
+Fingerprinter.NoWorkspace=Ude af stand til at opsamle filfingeraftryk, da der ikke er et arbejdsomr\u00E5de
Fingerprinter.Failed=Kunne ikke opsamle filfingeraftryk
-MailSender.FailureMail.Subject=Byg fejlet i Jenkins:
ArtifactArchiver.DeletingOld=Sletter gamle artifakter fra {0}
diff --git a/core/src/main/resources/hudson/tasks/Messages_de.properties b/core/src/main/resources/hudson/tasks/Messages_de.properties
index 8be1259aa1..71f07cac41 100644
--- a/core/src/main/resources/hudson/tasks/Messages_de.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_de.properties
@@ -32,10 +32,7 @@ ArtifactArchiver.ARCHIVING_ARTIFACTS=Archiviere Artefakte
ArtifactArchiver.DeletingOld=L\u00F6sche alte Artefakte von {0}
ArtifactArchiver.DisplayName=Artefakte archivieren
ArtifactArchiver.FailedToArchive=Artefakte konnten nicht archiviert werden: {0}
-ArtifactArchiver.NoIncludes=\
-Es sind keine Artefakte zur Archivierung konfiguriert.\n\
-Überprüfen Sie, ob in den Einstellungen ein Dateisuchmuster angegeben ist.\n\
-Wenn Sie alle Dateien archivieren möchten, geben Sie "**" an.
+ArtifactArchiver.NoIncludes=Es sind keine Artefakte zur Archivierung konfiguriert.\n\u00DCberpr\u00FCfen Sie, ob in den Einstellungen ein Dateisuchmuster angegeben ist.\nWenn Sie alle Dateien archivieren m\u00F6chten, geben Sie "**" an.
ArtifactArchiver.NoMatchFound=Keine Artefakte gefunden, die mit dem Dateisuchmuster "{0}" übereinstimmen. Ein Konfigurationsfehler?
BatchFile.DisplayName=Windows Batch Datei ausführen
@@ -71,28 +68,6 @@ JavadocArchiver.NoMatchFound=Keine Javadocs in {0} gefunden: {1}
JavadocArchiver.Publishing=Veröffentliche Javadocs
JavadocArchiver.UnableToCopy=Kann Javadocs nicht von {0} nach {1} kopieren
-MailSender.ListEmpty=Der Versuch wurde ignoriert, eine E-Mail an eine leere Liste von Empfängern zu verschicken.
-MailSender.NoAddress=Es konnte keine E-Mail an {0} geschickt werden, weil die E-Mail-Adresse unbekannt ist und kein Standardwert für die E-Mail-Domain eingestellt ist.
-MailSender.BackToNormal.Normal=normal
-MailSender.BackToNormal.Stable=stabil
-MailSender.BackToNormalMail.Subject=Jenkins-Build ist wieder {0}:
-MailSender.UnstableMail.Subject=Jenkins-Build ist instabil:
-MailSender.UnstableMail.ToUnStable.Subject=Jenkins-Build ist instabil geworden:
-MailSender.UnstableMail.StillUnstable.Subject=Jenkins-Build ist immer noch instabil:
-MailSender.FailureMail.Subject=Jenkins-Build fehlgeschlagen:
-MailSender.FailureMail.Changes=Änderungen:
-MailSender.FailureMail.FailedToAccessBuildLog=Zugriff auf Build-Protokoll fehlgeschlagen
-MailSender.Link=Siehe <{0}{1}>
-
-Mailer.DisplayName=E-Mail-Benachrichtigung
-Mailer.UserProperty.DisplayName=E-Mail
-Mailer.Unknown.Host.Name=Unbekannter Host:
-Mailer.Suffix.Error=Der Inhalt dieses Feldes sollte ''@'', gefolgt von einem Domain-Namen, sein.
-Mailer.Address.Not.Configured=Adresse nicht konfiguriert
-Mailer.Localhost.Error=Bitte verwenden Sie einen konkreten Hostnamen anstelle von ''localhost''.
-Mailer.EmailSentSuccessfully=Das Versenden der E-Mail war erfolgreich
-Mailer.FailedToSendEmail=Das Versenden der E-Mail ist fehlgeschlagen
-
Maven.DisplayName=Maven Goals aufrufen
Maven.ExecFailed=Befehlsausführung fehlgeschlagen
Maven.NotMavenDirectory={0} sieht nicht wie ein Maven-Verzeichnis aus.
diff --git a/core/src/main/resources/hudson/tasks/Messages_es.properties b/core/src/main/resources/hudson/tasks/Messages_es.properties
index d6ae3b569d..98214b5b6d 100644
--- a/core/src/main/resources/hudson/tasks/Messages_es.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_es.properties
@@ -32,10 +32,7 @@ ArtifactArchiver.ARCHIVING_ARTIFACTS=Guardando archivos
ArtifactArchiver.DeletingOld=Borrando archivos antiguos de {0}
ArtifactArchiver.DisplayName=Guardar los archivos generados
ArtifactArchiver.FailedToArchive=Error al guardar los archivos generados: {0}
-ArtifactArchiver.NoIncludes=\
- No hay archivos configurados para guardar.\n\
- Es probable que olvidaras configurar el patrón.\n\
- Si lo que quieres es guardar todos los ficheros del espacio de trabajo, utiliza "**"
+ArtifactArchiver.NoIncludes=No hay archivos configurados para guardar.\nEs probable que olvidaras configurar el patr\u00F3n.\nSi lo que quieres es guardar todos los ficheros del espacio de trabajo, utiliza "**"
ArtifactArchiver.NoMatchFound=No se encontraron archivos que cumplan el patrón "{0}". Comprueba la configuración
BatchFile.DisplayName=Ejecutar un comando de Windows
@@ -70,22 +67,6 @@ JavadocArchiver.NoMatchFound=No se encontraron javadocs en {0}: {1}
JavadocArchiver.Publishing=Publicando Javadoc
JavadocArchiver.UnableToCopy=Imposible copiar javadocs desde {0} a {1}
-MailSender.ListEmpty=Ignorado un intento de envio de correos a una lista de destinatarios vacía.
-MailSender.NoAddress=Falló el envio de correo a {0} porque ninguna dirección de correo es conocida, y no se ha configurado ningún dominio por defecto.
-MailSender.BackToNormal.Normal=Normal
-MailSender.BackToNormal.Stable=Estable
-MailSender.BackToNormalMail.Subject=El estado de Jenkins ha vuelto a {0} :
-MailSender.UnstableMail.Subject=El resultado de la ejecución es inestable:
-MailSender.UnstableMail.ToUnStable.Subject=El estado de Jenkins es inestable:
-MailSender.UnstableMail.StillUnstable.Subject=El estado de Jenkins continúa siendo inestable:
-MailSender.FailureMail.Subject=La ejecución en Jenkins ha fallado:
-MailSender.FailureMail.Changes=Cambios:
-MailSender.FailureMail.FailedToAccessBuildLog=Error al acceder al "log" de ejecución
-MailSender.Link=Echa un vistazo a <{0}{1}>
-
-Mailer.DisplayName=Notificación por correo
-Mailer.UserProperty.DisplayName=E-mail
-
Maven.DisplayName=Ejecutar tareas ''maven'' de nivel superior
Maven.ExecFailed=falló la ejecución del comando
Maven.NotMavenDirectory={0} no parece un directorio ''maven''
@@ -94,14 +75,5 @@ Maven.NotADirectory={0} no es un directorio
Shell.DisplayName=Ejecutar linea de comandos (shell)
-Mailer.Unknown.Host.Name=Nombre de Host desconocido:
-Mailer.Suffix.Error=Este campo deberia ser el símbolo "@" seguido de un nombre de dominio.
-Mailer.Address.Not.Configured=Dirección no configurada todavía
-Mailer.Localhost.Error=Escriba un nombre de servidor correcto en lugar de "localhost"
-
BuildTrigger.NoProjectSpecified=No se ha especificado ningún proyecto.
-Mailer.EmailSentSuccessfully=Correo enviado con éxito.
-Mailer.FailedToSendEmail=Error al enviar el correo.
-Mailer.TestMail.Subject=Correo de prueba Nro: {0}
TestJavadocArchiver.DisplayName.Javadoc=Probar javadoc.
-Mailer.TestMail.Content=Este es el correo de prueba número {0} enviado desde {1}
diff --git a/core/src/main/resources/hudson/tasks/Messages_fr.properties b/core/src/main/resources/hudson/tasks/Messages_fr.properties
index 71bade9d16..2f075a5e9e 100644
--- a/core/src/main/resources/hudson/tasks/Messages_fr.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_fr.properties
@@ -64,16 +64,10 @@ JavadocArchiver.DisplayName=Publier les Javadocs
JavadocArchiver.DisplayName.Generic=Documentation du code
JavadocArchiver.DisplayName.Javadoc=Javadoc
TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc
-JavadocArchiver.NoMatchFound=Pas de javadoc trouv\u00E9 dans {0}: {1}
+JavadocArchiver.NoMatchFound=Pas de javadoc trouv\u00E9 dans {0}\: {1}
JavadocArchiver.Publishing=Publication des Javadocs
JavadocArchiver.UnableToCopy=Impossible de copier les Javadocs de {0} vers {1}
-MailSender.ListEmpty=Tentative d''envoi d''email vers une liste de destinataires vide. Tentative ignor\u00E9e.
-MailSender.NoAddress=Impossible d''envoyer un e-mail vers {0} parce qu''aucune adresse email n''est sp\u00E9cifi\u00E9e et aucun domaine email n''est configur\u00E9
-
-Mailer.DisplayName=Notifier par email
-Mailer.UserProperty.DisplayName=Email
-
Maven.DisplayName=Invoquer les cibles Maven de haut niveau
Maven.ExecFailed=L''ex\u00E9cution de la commande a \u00E9chou\u00E9.
Maven.NotMavenDirectory={0} ne semble pas \u00EAtre un r\u00E9pertoire Maven
diff --git a/core/src/main/resources/hudson/tasks/Messages_ja.properties b/core/src/main/resources/hudson/tasks/Messages_ja.properties
index 013d40f443..80a8a555a5 100644
--- a/core/src/main/resources/hudson/tasks/Messages_ja.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_ja.properties
@@ -20,85 +20,59 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-Ant.DisplayName=Ant\u306e\u547c\u3073\u51fa\u3057
-Ant.ExecFailed=\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-Ant.ExecutableNotFound=\u9078\u629e\u3057\u305fAnt "{0}"\u306b\u306f\u5b9f\u884c\u5f62\u5f0f\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-Ant.GlobalConfigNeeded=Ant\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u305f\u4f4d\u7f6e\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u306e\u3067\u306f\uff1f
-Ant.NotADirectory={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-Ant.NotAntDirectory={0}\u306b\u306fAnt\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u306a\u3044\u3088\u3046\u3067\u3059
-Ant.ProjectConfigNeeded=\u3069\u306eAnt\u3092\u4f7f\u3046\u304b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u306e\u3067\u306f\uff1f
+Ant.DisplayName=Ant\u306E\u547C\u3073\u51FA\u3057
+Ant.ExecFailed=\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+Ant.ExecutableNotFound=\u9078\u629E\u3057\u305FAnt "{0}"\u306B\u306F\u5B9F\u884C\u5F62\u5F0F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+Ant.GlobalConfigNeeded=Ant\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u4F4D\u7F6E\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u306E\u3067\u306F\uFF1F
+Ant.NotADirectory={0}\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+Ant.NotAntDirectory={0}\u306B\u306FAnt\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u306A\u3044\u3088\u3046\u3067\u3059
+Ant.ProjectConfigNeeded=\u3069\u306EAnt\u3092\u4F7F\u3046\u304B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u306E\u3067\u306F\uFF1F
-ArtifactArchiver.ARCHIVING_ARTIFACTS=\u6210\u679c\u7269\u3092\u4fdd\u5b58\u4e2d
-ArtifactArchiver.DeletingOld=\u53e4\u3044\u6210\u679c\u7269\u3092\u524a\u9664\u4e2d
-ArtifactArchiver.DisplayName=\u6210\u679c\u7269\u3092\u4fdd\u5b58
-ArtifactArchiver.FailedToArchive=\u6210\u679c\u7269\u306e\u4fdd\u5b58\u306e\u5931\u6557\u3057\u307e\u3057\u305f
-ArtifactArchiver.NoIncludes=\u4fdd\u5b58\u3059\u308b\u6210\u679c\u7269\u304c\u4f55\u3082\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\n\
-\u6050\u3089\u304f\u30d5\u30a1\u30a4\u30eb\u30d1\u30bf\u30fc\u30f3\u306e\u6307\u5b9a\u3092\u5fd8\u308c\u305f\u306e\u3067\u3057\u3087\u3046\u3002\u8a2d\u5b9a\u30da\u30fc\u30b8\u306b\u623b\u3063\u3066\u30d1\u30bf\u30fc\u30f3\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\n\
-\u3082\u3057\u672c\u5f53\u306b\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u306e\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58\u3059\u308b\u3064\u3082\u308a\u306a\u3089\u3001"**"\u3068\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-ArtifactArchiver.NoMatchFound=\u6307\u5b9a\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u30d1\u30bf\u30fc\u30f3\u300c{0}\u300d\u306b\u5408\u81f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u8a2d\u5b9a\u30df\u30b9\uff1f
+ArtifactArchiver.ARCHIVING_ARTIFACTS=\u6210\u679C\u7269\u3092\u4FDD\u5B58\u4E2D
+ArtifactArchiver.DeletingOld=\u53E4\u3044\u6210\u679C\u7269\u3092\u524A\u9664\u4E2D
+ArtifactArchiver.DisplayName=\u6210\u679C\u7269\u3092\u4FDD\u5B58
+ArtifactArchiver.FailedToArchive=\u6210\u679C\u7269\u306E\u4FDD\u5B58\u306E\u5931\u6557\u3057\u307E\u3057\u305F
+ArtifactArchiver.NoIncludes=\u4FDD\u5B58\u3059\u308B\u6210\u679C\u7269\u304C\u4F55\u3082\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\n\u6050\u3089\u304F\u30D5\u30A1\u30A4\u30EB\u30D1\u30BF\u30FC\u30F3\u306E\u6307\u5B9A\u3092\u5FD8\u308C\u305F\u306E\u3067\u3057\u3087\u3046\u3002\u8A2D\u5B9A\u30DA\u30FC\u30B8\u306B\u623B\u3063\u3066\u30D1\u30BF\u30FC\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\n\u3082\u3057\u672C\u5F53\u306B\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u5168\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3059\u308B\u3064\u3082\u308A\u306A\u3089\u3001"**"\u3068\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ArtifactArchiver.NoMatchFound=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u30D1\u30BF\u30FC\u30F3\u300C{0}\u300D\u306B\u5408\u81F4\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u8A2D\u5B9A\u30DF\u30B9\uFF1F
-BatchFile.DisplayName=Windows\u30d0\u30c3\u30c1\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c
+BatchFile.DisplayName=Windows\u30D0\u30C3\u30C1\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C
-BuildTrigger.Disabled={0} \u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002\u30b9\u30ad\u30c3\u30d7\u3057\u307e\u3059\u3002
-BuildTrigger.DisplayName=\u4ed6\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d3\u30eb\u30c9
-BuildTrigger.InQueue={0} \u306f\u65e2\u306b\u30d3\u30eb\u30c9\u30ad\u30e5\u30fc\u306b\u3042\u308a\u307e\u3059
-BuildTrigger.NoSuchProject=''{0}''\u3068\u3044\u3046\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u3042\u308a\u307e\u305b\u3093\u3002''{1}''\u306e\u3053\u3068\u3067\u3059\u304b?
-BuildTrigger.NoProjectSpecified=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-BuildTrigger.NotBuildable={0} \u306f\u30d3\u30eb\u30c9\u53ef\u80fd\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-BuildTrigger.Triggering={0} \u306e\u65b0\u898f\u30d3\u30eb\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059
+BuildTrigger.Disabled={0} \u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059\u3002
+BuildTrigger.DisplayName=\u4ED6\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30D3\u30EB\u30C9
+BuildTrigger.InQueue={0} \u306F\u65E2\u306B\u30D3\u30EB\u30C9\u30AD\u30E5\u30FC\u306B\u3042\u308A\u307E\u3059
+BuildTrigger.NoSuchProject=''{0}''\u3068\u3044\u3046\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u3042\u308A\u307E\u305B\u3093\u3002''{1}''\u306E\u3053\u3068\u3067\u3059\u304B?
+BuildTrigger.NoProjectSpecified=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+BuildTrigger.NotBuildable={0} \u306F\u30D3\u30EB\u30C9\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+BuildTrigger.Triggering={0} \u306E\u65B0\u898F\u30D3\u30EB\u30C9\u3092\u5B9F\u884C\u3057\u307E\u3059
-CommandInterpreter.CommandFailed=\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-CommandInterpreter.UnableToDelete=\u30b9\u30af\u30ea\u30d7\u30c8\u30d5\u30a1\u30a4\u30eb {0} \u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093
-CommandInterpreter.UnableToProduceScript=\u30b9\u30af\u30ea\u30d7\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093
+CommandInterpreter.CommandFailed=\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+CommandInterpreter.UnableToDelete=\u30B9\u30AF\u30EA\u30D7\u30C8\u30D5\u30A1\u30A4\u30EB {0} \u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093
+CommandInterpreter.UnableToProduceScript=\u30B9\u30AF\u30EA\u30D7\u30C8\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093
-Fingerprinter.Aborted=\u4e2d\u6b62
-Fingerprinter.Action.DisplayName=\u6307\u7d0b\u3092\u898b\u308b
-Fingerprinter.DigestFailed={0} \u306e\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093
-Fingerprinter.DisplayName=\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u3092\u8a18\u9332\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u306e\u5229\u7528\u72b6\u6cc1\u3092\u8ffd\u8de1
-Fingerprinter.Failed=\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u306e\u8a18\u9332\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-Fingerprinter.FailedFor={0} \u306e\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u306e\u8a18\u9332\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-Fingerprinter.NoArchiving=\u6210\u679c\u7269\u306e\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u3092\u8a18\u9332\u3059\u308b\u3053\u3068\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u304c\u3001\u6210\u679c\u7269\u306e\u4fdd\u5b58\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-Fingerprinter.NoWorkspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u304c\u306a\u3044\u306e\u3067\u3001\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u3092\u8a18\u9332\u3067\u304d\u307e\u305b\u3093
-Fingerprinter.Recording=\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u306e\u8a18\u9332
+Fingerprinter.Aborted=\u4E2D\u6B62
+Fingerprinter.Action.DisplayName=\u6307\u7D0B\u3092\u898B\u308B
+Fingerprinter.DigestFailed={0} \u306E\u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u3092\u8A08\u7B97\u3067\u304D\u307E\u305B\u3093
+Fingerprinter.DisplayName=\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u3092\u8A18\u9332\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u306E\u5229\u7528\u72B6\u6CC1\u3092\u8FFD\u8DE1
+Fingerprinter.Failed=\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u306E\u8A18\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+Fingerprinter.FailedFor={0} \u306E\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u306E\u8A18\u9332\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+Fingerprinter.NoArchiving=\u6210\u679C\u7269\u306E\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u3092\u8A18\u9332\u3059\u308B\u3053\u3068\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u304C\u3001\u6210\u679C\u7269\u306E\u4FDD\u5B58\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+Fingerprinter.NoWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u306A\u3044\u306E\u3067\u3001\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u3092\u8A18\u9332\u3067\u304D\u307E\u305B\u3093
+Fingerprinter.Recording=\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u306E\u8A18\u9332
-InstallFromApache=Apache\u304b\u3089\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
+InstallFromApache=Apache\u304B\u3089\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
-JavadocArchiver.DisplayName=Javadoc\u306e\u4fdd\u5b58
-JavadocArchiver.DisplayName.Generic=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
+JavadocArchiver.DisplayName=Javadoc\u306E\u4FDD\u5B58
+JavadocArchiver.DisplayName.Generic=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
JavadocArchiver.DisplayName.Javadoc=Javadoc
TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc
-JavadocArchiver.NoMatchFound={0} \u306bJavadoc\u304c\u3042\u308a\u307e\u305b\u3093: {1}
-JavadocArchiver.Publishing=Javadoc\u306e\u4fdd\u5b58
-JavadocArchiver.UnableToCopy=Javadoc\u3092{0}\u304b\u3089{1}\u306b\u30b3\u30d4\u30fc\u3067\u304d\u307e\u305b\u3093
+JavadocArchiver.NoMatchFound={0} \u306BJavadoc\u304C\u3042\u308A\u307E\u305B\u3093\: {1}
+JavadocArchiver.Publishing=Javadoc\u306E\u4FDD\u5B58
+JavadocArchiver.UnableToCopy=Javadoc\u3092{0}\u304B\u3089{1}\u306B\u30B3\u30D4\u30FC\u3067\u304D\u307E\u305B\u3093
-MailSender.ListEmpty=\u53d7\u4fe1\u8005\u3092\u6307\u5b9a\u305b\u305a\u306b\u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u306e\u3067\u3001\u7121\u8996\u3057\u307e\u3059\u3002
-MailSender.NoAddress=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u4e0d\u660e\u3067\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30c9\u30e1\u30a4\u30f3\u3082\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u306e\u3067\u3001{0}\u5b9b\u306e\u30e1\u30fc\u30eb\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-MailSender.BackToNormal.Normal=\u6b63\u5e38
-MailSender.BackToNormal.Stable=\u5b89\u5b9a
-MailSender.BackToNormalMail.Subject=Jenkins\u306e\u30d3\u30eb\u30c9\u304c{0}\u306b\u623b\u308a\u307e\u3057\u305f:
-MailSender.UnstableMail.Subject=Jenkins\u306e\u30d3\u30eb\u30c9\u304c\u4e0d\u5b89\u5b9a\u3067\u3059:
-MailSender.UnstableMail.ToUnStable.Subject=Jenkins\u306e\u30d3\u30eb\u30c9\u304c\u4e0d\u5b89\u5b9a\u306b\u306a\u308a\u307e\u3057\u305f:
-MailSender.UnstableMail.StillUnstable.Subject=Jenkins\u306e\u30d3\u30eb\u30c9\u306f\u307e\u3060\u4e0d\u5b89\u5b9a\u306e\u307e\u307e\u3067\u3059:
-MailSender.FailureMail.Subject=Jenkins\u306e\u30d3\u30eb\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f:
-MailSender.FailureMail.Changes=\u5909\u66f4\u5c65\u6b74:
-MailSender.FailureMail.FailedToAccessBuildLog=\u30d3\u30eb\u30c9\u30ed\u30b0\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-MailSender.Link=<{0}{1}>\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+Maven.DisplayName=Maven\u306E\u547C\u3073\u51FA\u3057
+Maven.ExecFailed=\u30B3\u30DE\u30F3\u30C9\u306E\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+Maven.NotMavenDirectory={0}\u306B\u306FMaven\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u306A\u3044\u3088\u3046\u3067\u3059
+Maven.NoExecutable={0} \u306B\u5B9F\u884C\u5F62\u5F0F\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+Maven.NotADirectory={0}\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-Mailer.DisplayName=E-mail\u901a\u77e5
-Mailer.Unknown.Host.Name=\u4e0d\u660e\u306a\u30db\u30b9\u30c8\u540d\u3067\u3059\u3002:
-Mailer.Suffix.Error=\u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u306f@\u306b\u3064\u3065\u3051\u3066\u30c9\u30e1\u30a4\u30f3\u540d\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-Mailer.Address.Not.Configured=\u307e\u3060\u30a2\u30c9\u30ec\u30b9\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-Mailer.Localhost.Error=localhost\u306e\u4ee3\u308f\u308a\u306b\u59a5\u5f53\u306a\u30db\u30b9\u30c8\u540d\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-Mailer.UserProperty.DisplayName=E-mail
-Mailer.EmailSentSuccessfully=\u30e1\u30fc\u30eb\u3092\u6b63\u5e38\u306b\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002
-Mailer.FailedToSendEmail=\u30e1\u30fc\u30eb\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-Mailer.TestMail.Subject=\u30c6\u30b9\u30c8\u30e1\u30fc\u30eb #{0}
-Mailer.TestMail.Content=\u3053\u306e\u30e1\u30fc\u30eb\u306f\u3001{1}\u304b\u3089\u306e\u30c6\u30b9\u30c8\u30e1\u30fc\u30eb #{0}\u3067\u3059\u3002
-
-Maven.DisplayName=Maven\u306e\u547c\u3073\u51fa\u3057
-Maven.ExecFailed=\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-Maven.NotMavenDirectory={0}\u306b\u306fMaven\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u306a\u3044\u3088\u3046\u3067\u3059
-Maven.NoExecutable={0} \u306b\u5b9f\u884c\u5f62\u5f0f\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-Maven.NotADirectory={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-
-Shell.DisplayName=\u30b7\u30a7\u30eb\u306e\u5b9f\u884c
+Shell.DisplayName=\u30B7\u30A7\u30EB\u306E\u5B9F\u884C
diff --git a/core/src/main/resources/hudson/tasks/Messages_nl.properties b/core/src/main/resources/hudson/tasks/Messages_nl.properties
index 423d8f0d74..30527bbead 100644
--- a/core/src/main/resources/hudson/tasks/Messages_nl.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_nl.properties
@@ -30,9 +30,7 @@ Ant.ProjectConfigNeeded= Misschien dient u uw job te configureren om \u00E9\u00E
ArtifactArchiver.DeletingOld=Verwijder oude artefacten van {0}
ArtifactArchiver.DisplayName=Archiveer de artefacten
ArtifactArchiver.FailedToArchive=Fout bij het archiveren van de artefacten: {0}
-ArtifactArchiver.NoIncludes=\
-Er werden geen artefacten voor archivering geconfigureerd.\n\
-Waarschijnlijk werd geen bestands-selectiepatroon geconfigureerd. Gelieve dit te configureren.\n\
+ArtifactArchiver.NoIncludes=Er werden geen artefacten voor archivering geconfigureerd.\nWaarschijnlijk werd geen bestands-selectiepatroon geconfigureerd. Gelieve dit te configureren.\n
Indien je alle bestanden in de werkplaats wenst te archiveren, gelieve dan "**" als patroon te configureren.
ArtifactArchiver.NoMatchFound=Er werden geen artefacten gevonden die voldoen aan het bestands-selectiepatroon "{0}". Misschien dient U uw configuratie aan te passen?
@@ -66,12 +64,6 @@ TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc
JavadocArchiver.Publishing=Javadoc wordt gepubliceerd
JavadocArchiver.UnableToCopy=Kon Javadoc niet copi\u00EBren van {0} naar {1}
-MailSender.ListEmpty=Een poging om e-mail te versturen naar een lege lijst van bestemmelingen werd genegeerd.
-MailSender.NoAddress=Kon e-mail naar {0} niet verzenden. E-mail adres is onbekend en er werd geen standaard e-mail domein geconfigureerd.
-
-Mailer.DisplayName=E-mail Notificatie
-Mailer.UserProperty.DisplayName=E-mail
-
Maven.DisplayName=Voer top-niveau Maven taken uit
Maven.ExecFailed=uitvoer commando is gefaald
Maven.NotMavenDirectory={0} is geen Maven folder
diff --git a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties
index 68cfc9e226..ef5033135d 100644
--- a/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_pt_BR.properties
@@ -21,31 +21,28 @@
# THE SOFTWARE.
Ant.DisplayName=Invocar Ant
-Ant.ExecFailed=Execu\u00e7\u00e3o de comando falhou.
-Ant.GlobalConfigNeeded= Talvez voc\u00ea precise configurar onde sua instala\u00e7\u00e3o do Ant est\u00e1.
-Ant.NotADirectory={0} n\u00e3o \u00e9 um diret\u00f3rio
-Ant.NotAntDirectory={0} n\u00e3o parece ser um diret\u00f3rio Ant
-Ant.ProjectConfigNeeded= Talvez voc\u00ea precise configurar a tarefa para escolher uma de suas instala\u00e7\u00f5es do Ant.
+Ant.ExecFailed=Execu\u00E7\u00E3o de comando falhou.
+Ant.GlobalConfigNeeded= Talvez voc\u00EA precise configurar onde sua instala\u00E7\u00E3o do Ant est\u00E1.
+Ant.NotADirectory={0} n\u00E3o \u00E9 um diret\u00F3rio
+Ant.NotAntDirectory={0} n\u00E3o parece ser um diret\u00F3rio Ant
+Ant.ProjectConfigNeeded= Talvez voc\u00EA precise configurar a tarefa para escolher uma de suas instala\u00E7\u00F5es do Ant.
ArtifactArchiver.DeletingOld=Apagando artefatos antigos de {0}
ArtifactArchiver.DisplayName=Arquivar os artefatos
ArtifactArchiver.FailedToArchive=Falha ao arquivar artefatos: {0}
-ArtifactArchiver.NoIncludes=\
-Nenhum artefato est\u00e1 configurado para arquivamento.\n\
-Voc\u00ea provavelmente esqueceu de informar o padr\u00e3o de arquivo, assim por favor volte para a configura\u00e7\u00e3o e especifique-o.\n\
-Se voc\u00ea na verdade quis arquivar todos os arquivos do workspace, por favor especifique "**"
-ArtifactArchiver.NoMatchFound=Nenhum artefato encontrado casa com o padr\u00e3o de arquivo "{0}". Erro de configura\u00e7\u00e3o?
+ArtifactArchiver.NoIncludes=Nenhum artefato est\u00E1 configurado para arquivamento.\nVoc\u00EA provavelmente esqueceu de informar o padr\u00E3o de arquivo, assim por favor volte para a configura\u00E7\u00E3o e especifique-o.\nSe voc\u00EA na verdade quis arquivar todos os arquivos do workspace, por favor especifique "**"
+ArtifactArchiver.NoMatchFound=Nenhum artefato encontrado casa com o padr\u00E3o de arquivo "{0}". Erro de configura\u00E7\u00E3o?
BatchFile.DisplayName=Executar comando do Windows
-BuildTrigger.Disabled={0} est\u00e1 desabilitado. Disparo foi pulado
+BuildTrigger.Disabled={0} est\u00E1 desabilitado. Disparo foi pulado
BuildTrigger.DisplayName=Construir outros projetos
-BuildTrigger.InQueue={0} j\u00e1 est\u00e3o na fila
-BuildTrigger.NoSuchProject=N\u00e3o existe tal projeto ''{0}''. Voc\u00ea quis dizer ''{1}''?
-BuildTrigger.NotBuildable={0} n\u00e3o pode ser constru\u00eddo
-BuildTrigger.Triggering=Disparando uma nova constru\u00e7\u00e3o de {0}
+BuildTrigger.InQueue={0} j\u00E1 est\u00E3o na fila
+BuildTrigger.NoSuchProject=N\u00E3o existe tal projeto ''{0}''. Voc\u00EA quis dizer ''{1}''?
+BuildTrigger.NotBuildable={0} n\u00E3o pode ser constru\u00EDdo
+BuildTrigger.Triggering=Disparando uma nova constru\u00E7\u00E3o de {0}
-CommandInterpreter.CommandFailed=execu\u00e7\u00e3o de comando falhou
+CommandInterpreter.CommandFailed=execu\u00E7\u00E3o de comando falhou
CommandInterpreter.UnableToDelete=Incapaz de apagar o arquivo de script {0}
CommandInterpreter.UnableToProduceScript=Incapaz de produzir um arquivo de script
@@ -55,8 +52,8 @@ Fingerprinter.DigestFailed=Falhou ao computar resumo para {0}
Fingerprinter.DisplayName=Gravar fingerprints de arquivos para trilhar o uso
Fingerprinter.Failed=Falhou ao gravar fingerprints
Fingerprinter.FailedFor=falhou ao gravar fingerprint para {0}
-Fingerprinter.NoArchiving=Artefatos de constru\u00e7\u00e3o s\u00e3o supostos para ter o fingerprint marcado, mas o arquivamento de artefato de constru\u00e7\u00e3o n\u00e3o est\u00e1 configurado
-Fingerprinter.NoWorkspace=Incapaz de gravar fingerprints porque n\u00e3o h\u00e1 nenhum workspace
+Fingerprinter.NoArchiving=Artefatos de constru\u00E7\u00E3o s\u00E3o supostos para ter o fingerprint marcado, mas o arquivamento de artefato de constru\u00E7\u00E3o n\u00E3o est\u00E1 configurado
+Fingerprinter.NoWorkspace=Incapaz de gravar fingerprints porque n\u00E3o h\u00E1 nenhum workspace
Fingerprinter.Recording=Gravando fingerprints
JavadocArchiver.DisplayName=Publicar Javadoc
@@ -66,52 +63,18 @@ TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc
JavadocArchiver.Publishing=Publicando Javadoc
JavadocArchiver.UnableToCopy=Incapaz de copiar Javadoc de {0} para {1}
-MailSender.ListEmpty=Uma tentativa de enviar um e-mail para uma lista vazia de destinat\u00c1rios, ignorada.
-MailSender.NoAddress=Falhou ao enviar e-mail para {0} porque n\u00e3o h\u00e1 nenhum endere\u00e7o de e-mail conhecido, e nenhum dom\u00ednio de e-mail padr\u00e3o est\u00e1 configurado
-
-Mailer.DisplayName=Notifica\u00E7\u00E3o de E-mail
-Mailer.UserProperty.DisplayName=E-mail
-
-Maven.DisplayName=Invocar alvos Maven de alto n\u00edvel
-Maven.ExecFailed=execu\u00e7\u00e3o de comando falhou
-Maven.NotMavenDirectory={0} n\u00e3o parece ser um diret\u00f3rio Maven
-Maven.NoExecutable=N\u00e3o pode encontrar nehum execut\u00e1vel em {0}
-Maven.NotADirectory={0} n\u00e3o \u00e9 um diret\u00f3rio
+Maven.DisplayName=Invocar alvos Maven de alto n\u00EDvel
+Maven.ExecFailed=execu\u00E7\u00E3o de comando falhou
+Maven.NotMavenDirectory={0} n\u00E3o parece ser um diret\u00F3rio Maven
+Maven.NoExecutable=N\u00E3o pode encontrar nehum execut\u00E1vel em {0}
+Maven.NotADirectory={0} n\u00E3o \u00E9 um diret\u00F3rio
Shell.DisplayName=Executar shell
-# Changes:
-MailSender.FailureMail.Changes=Mudan\u00e7as
-# Failed to access build log
-MailSender.FailureMail.FailedToAccessBuildLog=Falhou ao acessar o log de constru\u00e7\u00f5es
# Cannot find executable from the choosen Ant installation "{0}"
-Ant.ExecutableNotFound=N\u00e3o pode ser executado pela instala\u00e7\u00e3o ANT "{0}"
+Ant.ExecutableNotFound=N\u00E3o pode ser executado pela instala\u00E7\u00E3o ANT "{0}"
# Archiving artifacts
ArtifactArchiver.ARCHIVING_ARTIFACTS=Arquivando artefatos
# Install from Apache
InstallFromApache=Instalar a partir do Apache
-# Jenkins build became unstable:
-MailSender.UnstableMail.ToUnStable.Subject=Constru\u00e7\u00e3o tornou-se inst\u00e1vel
-# normal
-MailSender.BackToNormal.Normal=Normal
-# Jenkins build is still unstable:
-MailSender.UnstableMail.StillUnstable.Subject=Constru\u00e7\u00e3o permanece inst\u00e1vel
# No javadoc found in {0}: {1}
JavadocArchiver.NoMatchFound=Nenhum javadoc encontrado {0}: {1}
-# See <{0}{1}>
-MailSender.Link=Veja <{0}{1}>
-# stable
-MailSender.BackToNormal.Stable=Est\u00e1vel
-# address not configured yet
-Mailer.Address.Not.Configured=Endere\u00e7o ainda n\u00e3o configurado
-# This field should be ''@'' followed by a domain name.
-Mailer.Suffix.Error=Esse campo precisa de um ''@'' seguido do nome de dom\u00ednio
-# Jenkins build is back to {0} :
-MailSender.BackToNormalMail.Subject=Constru\u00e7\u00e3o voltou para {0} :
-# Please set a valid host name, instead of localhost
-Mailer.Localhost.Error=Por favor insira uma nome de host v\u00e1lido.
-# Build failed in Jenkins:
-MailSender.FailureMail.Subject=Constru\u00e7\u00e3o falhou.
-# Unknown host name:
-Mailer.Unknown.Host.Name=Nome de host n\u00e3o localizado:
-# Jenkins build is unstable:
-MailSender.UnstableMail.Subject=Constru\u00e7\u00e3o est\u00e1 inst\u00e1vel
diff --git a/core/src/main/resources/hudson/tasks/Messages_ru.properties b/core/src/main/resources/hudson/tasks/Messages_ru.properties
index 8ba61ec860..e2e2622874 100644
--- a/core/src/main/resources/hudson/tasks/Messages_ru.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_ru.properties
@@ -29,7 +29,7 @@ Ant.ProjectConfigNeeded= \u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043
ArtifactArchiver.DeletingOld=\u0423\u0434\u0430\u043B\u044F\u044E \u0441\u0442\u0430\u0440\u044B\u0435 \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B \u0438\u0437 {0}
ArtifactArchiver.DisplayName=\u0417\u0430\u0430\u0440\u0445\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B
-ArtifactArchiver.FailedToArchive=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0437\u0430\u0430\u0440\u0445\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B: {0}
+ArtifactArchiver.FailedToArchive=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0437\u0430\u0430\u0440\u0445\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B\: {0}
ArtifactArchiver.NoIncludes=\
\u041D\u0435\u0442 \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u043E\u0432 \u0443\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0445 \u0434\u043B\u044F \u0430\u0440\u0445\u0438\u0432\u0430\u0446\u0438\u0438.\n\
\u041F\u043E\u0445\u043E\u0436\u0435, \u0432\u044B \u0437\u0430\u0431\u044B\u043B\u0438 \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u0448\u0430\u0431\u043B\u043E\u043D \u0438\u043C\u0435\u043D\u0438 \u0444\u0430\u0439\u043B\u0430, \u043F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0432\u0435\u0440\u043D\u0438\u0442\u0435\u0441\u044C \u043D\u0430 \u044D\u043A\u0440\u0430\u043D \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0438 \u0443\u043A\u0430\u0436\u0438\u0442\u0435 \u0435\u0433\u043E.\n\
@@ -66,12 +66,6 @@ TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc
JavadocArchiver.Publishing=\u041F\u0443\u0431\u043B\u0438\u043A\u0443\u044E Javadoc
JavadocArchiver.UnableToCopy=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0441\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C Javadoc \u0438\u0437 {0} \u0432 {1}
-MailSender.ListEmpty=\u041F\u043E\u043F\u044B\u0442\u043A\u0430 \u043E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u0435 \u043F\u0443\u0441\u0442\u043E\u043C\u0443 \u0441\u043F\u0438\u0441\u043A\u0443 \u0430\u0434\u0440\u0435\u0441\u0430\u0442\u043E\u0432. \u041F\u0440\u043E\u0438\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043E.
-MailSender.NoAddress=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 {0} \u0442\u0430\u043A \u043A\u0430\u043A \u0435\u0433\u043E \u0430\u0434\u0440\u0435\u0441 \u043D\u0435 \u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043D, \u0430 \u0434\u043E\u043C\u0435\u043D \u043F\u043E-\u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u043D\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D
-
-Mailer.DisplayName=\u0423\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u0435 \u043F\u043E \u043F\u043E\u0447\u0442\u0435
-Mailer.UserProperty.DisplayName=\u0410\u0434\u0440\u0435\u0441 \u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043F\u043E\u0447\u0442\u044B
-
Maven.DisplayName=\u0412\u044B\u0437\u0432\u0430\u0442\u044C \u0446\u0435\u043B\u0438 Maven \u0432\u0435\u0440\u0445\u043D\u0435\u0433\u043E \u0443\u0440\u043E\u0432\u043D\u044F
Maven.ExecFailed=\u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u043A\u043E\u043C\u0430\u043D\u0434\u044B \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C
Maven.NotMavenDirectory={0} \u043D\u0435 \u043F\u043E\u0445\u043E\u0436\u0430 \u043D\u0430 \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044E Maven
diff --git a/core/src/main/resources/hudson/tasks/Messages_tr.properties b/core/src/main/resources/hudson/tasks/Messages_tr.properties
index 303d950eb4..89129066e1 100644
--- a/core/src/main/resources/hudson/tasks/Messages_tr.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_tr.properties
@@ -29,7 +29,7 @@ Ant.ProjectConfigNeeded= \u00C7al\u0131\u015Ft\u0131rd\u0131\u011F\u0131n\u0131z
ArtifactArchiver.DeletingOld={0}''dan, eski artefaktlar siliniyor
ArtifactArchiver.DisplayName=Artefaktlar\u0131 Ar\u015Fivle
-ArtifactArchiver.FailedToArchive=Artefakt ar\u015Fivleme ba\u015Far\u0131s\u0131z oldu: {0}
+ArtifactArchiver.FailedToArchive=Artefakt ar\u015Fivleme ba\u015Far\u0131s\u0131z oldu\: {0}
ArtifactArchiver.NoIncludes=\
Herhangi bir artefakt, ar\u015Fivleme i\u00E7in ayarlanmad\u0131.\n\
Konfig\u00FCrasyon k\u0131sm\u0131nda File Pattern ayarlar\u0131n\u0131 kontrol edin.\n\
@@ -66,12 +66,6 @@ TestJavadocArchiver.DisplayName.Javadoc=Test Javadoc
JavadocArchiver.Publishing=Javadoc yay\u0131nlan\u0131yor
JavadocArchiver.UnableToCopy={0}''dan {1}''e Javadoc kopyalanam\u0131yor
-MailSender.ListEmpty=Bo\u015F al\u0131c\u0131 listesine e-posta g\u00F6nderilmeye \u00E7al\u0131\u015F\u0131ld\u0131\u011F\u0131 i\u00E7in iptal edildi.
-MailSender.NoAddress={0}''a e-posta g\u00F6nderilemedi \u00E7\u00FCnk\u00FC herhangi bir e-posta adresi bilinmiyor, ve varsay\u0131lan e-posta sunucusu konfig\u00FCrasyonu yap\u0131lmam\u0131\u015F.
-
-Mailer.DisplayName=E-posta Bilgilendirme
-Mailer.UserProperty.DisplayName=E-posta
-
Maven.DisplayName=En \u00FCst seviye Maven hedeflerini \u00E7al\u0131\u015Ft\u0131r
Maven.ExecFailed=Komut \u00E7al\u0131\u015Ft\u0131rma ba\u015Far\u0131s\u0131z
Maven.NotMavenDirectory={0}, bir Maven dizinine benzemiyor
diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
index 69c778d9d4..bacb2e00c5 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
-
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config.groovy b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config.groovy
new file mode 100644
index 0000000000..fc1fcd6f1c
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config.groovy
@@ -0,0 +1,14 @@
+package jenkins.model.JenkinsLocationConfiguration
+
+import hudson.Functions
+
+def f=namespace(lib.FormTagLib)
+
+f.section(title:_("Jenkins Location")) {
+ f.entry(title:_("Jenkins URL"), field:"url") {
+ f.textbox(default: Functions.inferHudsonURL(request))
+ }
+ f.entry(title:_("System Admin e-mail address"), field:"adminAddress") {
+ f.textbox()
+ }
+}
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_da.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
similarity index 91%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_da.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
index 9eecf8faab..731a6249df 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_da.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-description=Din e-mail adresse, s\u00e5som knupouls@gmail.com
-E-mail\ address=E-mail adresse
+System\ Admin\ E-mail\ Address=Systemadministratorens E-mail adresse
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_de.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
similarity index 92%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_de.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
index 35c52c8e73..3bd361d5b6 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_de.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-E-mail\ address=E-Mail-Adresse
-description=Ihre E-Mail-Adresse, z.B. joe.chin@sun.com
+System\ Admin\ E-mail\ Address=E-Mail-Adresse des Systemadministrators
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_zh_CN.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_es.properties
similarity index 92%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_zh_CN.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_es.properties
index 9964925678..f12fe2f322 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_zh_CN.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_es.properties
@@ -20,4 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-E-mail\ address=\u90ae\u4ef6\u5730\u5740
+Jenkins\ URL=Dirección web de Jenkins
+Sender\ E-mail\ Address=Dirección de remitente
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_fr.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
similarity index 91%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_fr.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
index d8f2201dae..b3ccab7f21 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_fr.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-E-mail\ address=Adresse email
-description=Votre adresse email, au format joe.l.indien@sun.com
+System\ Admin\ E-mail\ Address=Adresse email de l''administrateur syst\u00cbme
+Jenkins\ URL=URL de Jenkins
diff --git a/core/src/main/resources/hudson/tasks/Mailer/global_ja.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/global_ja.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ja.properties
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_nl.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
similarity index 93%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_nl.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
index be5587ab3e..ed081a0ab9 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_nl.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-E-mail\ address=E-mail
-description=Omschrijving
+System\ Admin\ E-mail\ Address=E-mail systeemadministrator
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_pt_BR.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
similarity index 91%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_pt_BR.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
index 11be628b1a..64d05ebaa2 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-E-mail\ address=Endere\u00e7o de e-mail
-description=Seu endere\u00e7o de e-mail, como joe.chin@sun.com
+System\ Admin\ E-mail\ Address=Endere\u00e7o de E-mail do Administrador do Sistema
+Jenkins\ URL=URL do Jenkins
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_ru.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
similarity index 85%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_ru.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
index de097169f2..b9c41aa46a 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_ru.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-E-mail\ address=E-mail \u0430\u0434\u0440\u0435\u0441
-description=\u0412\u0430\u0448 \u0430\u0434\u0440\u0435\u0441, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440 joe.chin@sun.com
+System\ Admin\ E-mail\ Address=\u0410\u0434\u0440\u0435\u0441 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_tr.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
similarity index 92%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_tr.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
index fb60f778e5..4b5c74527a 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_tr.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-description=E-posta adresiniz, joe.chin@sun.com gibi...
-E-mail\ address=E-posta\ adresi
+System\ Admin\ E-mail\ Address=Sistem\ Admin\ e-posta\ Adresi
+Jenkins\ URL=Jenkins\ URL'i
diff --git a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_fi.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
similarity index 91%
rename from core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_fi.properties
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
index 3c844cc10c..c3df1aaf79 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/UserProperty/config_fi.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
@@ -20,4 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-E-mail\ address=S\u00E4hk\u00F6postiosoite
+System\ Admin\ E-mail\ Address=\u7cfb\u7edf\u7ba1\u7406\u5458\u90ae\u4ef6\u5730\u5740
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_de.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_de.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_de.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_de.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_fr.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_fr.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_fr.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_fr.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ja.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ja.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ja.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ja.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_nl.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_nl.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_nl.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_nl.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_pt_BR.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_pt_BR.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_pt_BR.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_pt_BR.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ru.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ru.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_ru.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ru.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_tr.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_tr.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_tr.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_tr.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_zh_CN.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_zh_CN.html
similarity index 98%
rename from core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_zh_CN.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_zh_CN.html
index c832b398db..39856ab85b 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/help-adminAddress_zh_CN.html
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_zh_CN.html
@@ -1,3 +1,3 @@
-
- Jenkins将用这个地址发送通知邮件给项目拥有者.这里可以填写"foo@acme.org"或者像"Jenkins Daemon <foo@acme.org>"形式的内容.
-
+
+ Jenkins将用这个地址发送通知邮件给项目拥有者.这里可以填写"foo@acme.org"或者像"Jenkins Daemon <foo@acme.org>"形式的内容.
+
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_de.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_de.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_de.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_de.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_fr.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_fr.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_fr.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_fr.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_ja.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_ja.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_ja.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_ja.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_nl.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_nl.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_nl.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_nl.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_pt_BR.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_pt_BR.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_pt_BR.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_pt_BR.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_ru.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_ru.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_ru.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_ru.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_tr.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_tr.html
similarity index 100%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_tr.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_tr.html
diff --git a/core/src/main/resources/hudson/tasks/Mailer/help-url_zh_CN.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_zh_CN.html
similarity index 97%
rename from core/src/main/resources/hudson/tasks/Mailer/help-url_zh_CN.html
rename to core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_zh_CN.html
index f2554be576..98f3c5bcb6 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/help-url_zh_CN.html
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url_zh_CN.html
@@ -1,7 +1,7 @@
-
- 此项是可选的,指定安装Jenkins的HTTP地址,例如
http://yourhost.yourdomain/jenkins/.
- 这个值用来在邮件中生产Jenkins链接.
-
-
- 此项是有必要的,因为Jenkins无法探测到自己的URL地址.
-
+
+ 此项是可选的,指定安装Jenkins的HTTP地址,例如
http://yourhost.yourdomain/jenkins/.
+ 这个值用来在邮件中生产Jenkins链接.
+
+
+ 此项是有必要的,因为Jenkins无法探测到自己的URL地址.
+
diff --git a/core/src/main/resources/jenkins/model/Messages.properties b/core/src/main/resources/jenkins/model/Messages.properties
index 26681db2c6..9ceff82b2f 100644
--- a/core/src/main/resources/jenkins/model/Messages.properties
+++ b/core/src/main/resources/jenkins/model/Messages.properties
@@ -60,7 +60,10 @@ CLI.shutdown.shortDescription=Immediately shuts down Jenkins server
CLI.safe-shutdown.shortDescription=Puts Jenkins into the quiet mode, wait for existing builds to be completed, and then shut down Jenkins.
DefaultProjectNamingStrategy.DisplayName=Default
-PatternProjectNamingStrategy.DisplayName=Pattern
+Mailer.Address.Not.Configured=address not configured yet
+Mailer.Localhost.Error=Please set a valid host name, instead of localhost
+
+PatternProjectNamingStrategy.DisplayName=Pattern
PatternProjectNamingStrategy.NamePatternRequired=Name Pattern is required
PatternProjectNamingStrategy.NamePatternInvalidSyntax=regular expression's syntax is invalid.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/Messages_da.properties b/core/src/main/resources/jenkins/model/Messages_da.properties
index 3fcf4b3442..c355612da1 100644
--- a/core/src/main/resources/jenkins/model/Messages_da.properties
+++ b/core/src/main/resources/jenkins/model/Messages_da.properties
@@ -49,3 +49,6 @@ CLI.restart.shortDescription=Genstart Jenkins
CLI.cancel-quiet-down.shortDescription=Sl\u00e5 effekten af "quite-down" kommandoen fra.
CLI.reload-configuration.shortDescription=Genindl\u00e6s alle data fra filsystemet. \
Nyttigt hvis du har modificeret konfigurationsfiler direkte, udenom Jenkins.
+
+Mailer.Address.Not.Configured=Adresse ikke konfigureret
+Mailer.Localhost.Error=Venligst inds\u00e6t et gyldigt v\u00e6rtsnavn, istedet for localhost
diff --git a/core/src/main/resources/jenkins/model/Messages_de.properties b/core/src/main/resources/jenkins/model/Messages_de.properties
index b945f72cd1..7ad6a80f9b 100644
--- a/core/src/main/resources/jenkins/model/Messages_de.properties
+++ b/core/src/main/resources/jenkins/model/Messages_de.properties
@@ -52,3 +52,5 @@ CLI.cancel-quiet-down.shortDescription=Wirkung des Befehls "quiet-down" wieder a
CLI.reload-configuration.shortDescription=Alle Daten im Speicher verwerfen und Konfiguration neu von Festplatte laden. Dies ist n\u00fctzlich, wenn Sie \u00c4nderungen direkt im Dateisystem vorgenommen haben.
CLI.safe-restart.shortDescription=Startet Jenkins neu.
+Mailer.Address.Not.Configured=Adresse nicht konfiguriert
+Mailer.Localhost.Error=Bitte verwenden Sie einen konkreten Hostnamen anstelle von ''localhost''.
diff --git a/core/src/main/resources/jenkins/model/Messages_es.properties b/core/src/main/resources/jenkins/model/Messages_es.properties
index 43dec14eb5..4b4c61a764 100644
--- a/core/src/main/resources/jenkins/model/Messages_es.properties
+++ b/core/src/main/resources/jenkins/model/Messages_es.properties
@@ -59,3 +59,6 @@ Hudson.JobNameConventionNotApplyed=el nombre ''{0}'' no cumple el patr
CLI.shutdown.shortDescription=Apagar inmediatamente Jenkins.
CauseOfInterruption.ShortDescription=Cancelado por {0}
PatternProjectNamingStrategy.NamePatternInvalidSyntax=La sintaxis de la expresión regular no es válida
+
+Mailer.Address.Not.Configured=Dirección no configurada todavía
+Mailer.Localhost.Error=Escriba un nombre de servidor correcto en lugar de "localhost"
diff --git a/core/src/main/resources/jenkins/model/Messages_ja.properties b/core/src/main/resources/jenkins/model/Messages_ja.properties
index 5151ab11d3..115d02941b 100644
--- a/core/src/main/resources/jenkins/model/Messages_ja.properties
+++ b/core/src/main/resources/jenkins/model/Messages_ja.properties
@@ -58,4 +58,7 @@ DefaultProjectNamingStrategy.DisplayName=\u30c7\u30d5\u30a9\u30eb\u30c8
PatternProjectNamingStrategy.DisplayName=\u30d1\u30bf\u30fc\u30f3
PatternProjectNamingStrategy.NamePatternRequired=\u30d1\u30bf\u30fc\u30f3\u306f\u5fc5\u9808\u3067\u3059\u3002
-PatternProjectNamingStrategy.NamePatternInvalidSyntax=\u6b63\u898f\u8868\u73fe\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059\u3002
\ No newline at end of file
+PatternProjectNamingStrategy.NamePatternInvalidSyntax=\u6b63\u898f\u8868\u73fe\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059\u3002
+
+Mailer.Address.Not.Configured=\u307e\u3060\u30a2\u30c9\u30ec\u30b9\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+Mailer.Localhost.Error=localhost\u306e\u4ee3\u308f\u308a\u306b\u59a5\u5f53\u306a\u30db\u30b9\u30c8\u540d\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties
index 8c1ac60230..583201d057 100644
--- a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties
@@ -39,7 +39,12 @@ Hudson.NodeDescription=NO mestre do Jenkins
CLI.safe-restart.shortDescription=Seguro reiniciar o Jenkins
CLI.quiet-down.shortDescription=Desativar em modo silencioso, em prepara\u00e7\u00e3o para o rein\u00edcio. N\u00e3o come\u00e7e nenhuma constru\u00e7\u00e3o.
CLI.cancel-quiet-down.shortDescription=Cancela o comando "quiet-down"
-CLI.reload-configuration.shortDescription=Descarta todo o conteudo de mem\u00f3ria e recarrega novamente a partir do arquivo. /
+CLI.reload-configuration.shortDescription=Descarta todo o conteudo de mem\u00f3ria e recarrega novamente a partir do arquivo. \
Indicado quando voc\u00ea modificou os arquivos diretamente no disco.
CLI.restart.shortDescription=Reiniciar o Jenkins
CLI.keep-build.shortDescription=Marcar a constru\u00e7\u00e3o como permanente
+
+# address not configured yet
+Mailer.Address.Not.Configured=Endere\u00e7o ainda n\u00e3o configurado
+# Please set a valid host name, instead of localhost
+Mailer.Localhost.Error=Por favor insira uma nome de host v\u00e1lido.
diff --git a/debian/debian/changelog b/debian/debian/changelog
index 699fb8b591..262527e957 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.493) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi Sun, 09 Dec 2012 08:20:18 -0800
+
jenkins (1.492) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
diff --git a/debian/debian/jenkins.default b/debian/debian/jenkins.default
index e194fe81e9..77a1d80592 100644
--- a/debian/debian/jenkins.default
+++ b/debian/debian/jenkins.default
@@ -52,7 +52,7 @@ PREFIX=/jenkins
# --httpsPort=$HTTP_PORT
# --ajp13Port=$AJP_PORT
# --argumentsRealm.passwd.$ADMIN_USER=[password]
-# --argumentsRealm.$ADMIN_USER=admin
+# --argumentsRealm.roles.$ADMIN_USER=admin
# --webroot=~/.jenkins/war
# --prefix=$PREFIX
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 574efb9116..7cd9f3b567 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
pom
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
maven-plugin
@@ -66,6 +66,11 @@ THE SOFTWARE.
javadoc
1.0
+
+ org.jenkins-ci.plugins
+ mailer
+ 1.3
+
javax.servlet
servlet-api
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index 1cd6e3036b..897977c19a 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
@@ -61,7 +61,6 @@ import hudson.tasks.BuildWrapper;
import hudson.tasks.BuildWrappers;
import hudson.tasks.Builder;
import hudson.tasks.Fingerprinter;
-import hudson.tasks.Mailer;
import hudson.tasks.Maven;
import hudson.tasks.Maven.MavenInstallation;
import hudson.tasks.Publisher;
@@ -103,6 +102,7 @@ import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.tools.ant.taskdefs.email.Mailer;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.HttpResponses;
import org.kohsuke.stapler.QueryParameter;
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 84906d1e53..afa2897101 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
org.jenkins-ci.plugins
plugin
Jenkins plugin POM
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
pom
org.jenkins-ci.main
maven-plugin
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
@@ -44,25 +44,25 @@
org.jenkins-ci.main
jenkins-war
war
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
test
org.jenkins-ci.main
jenkins-core
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
provided
org.jenkins-ci.main
jenkins-test-harness
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
test
org.jenkins-ci.main
ui-samples-plugin
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
test
diff --git a/pom.xml b/pom.xml
index b4bf5c6023..c47b635692 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
org.jenkins-ci.main
pom
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
pom
Jenkins main module
diff --git a/test/pom.xml b/test/pom.xml
index 7ce3c2bfad..126516725e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
pom
org.jenkins-ci.main
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
org.jenkins-ci.main
jenkins-test-harness
@@ -76,6 +76,11 @@ THE SOFTWARE.
subversion
1.26
+
+ org.jenkins-ci.plugins
+ mailer
+ 1.4-SNAPSHOT
+
org.mortbay.jetty
jetty
diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
index c7cc481250..1acb0b7f60 100644
--- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
@@ -24,6 +24,7 @@
*/
package org.jvnet.hudson.test;
+import com.gargoylesoftware.htmlunit.AlertHandler;
import com.gargoylesoftware.htmlunit.html.HtmlImage;
import com.google.inject.Injector;
import hudson.ClassicPluginStrategy;
@@ -1659,6 +1660,12 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
}
});
+ setAlertHandler(new AlertHandler() {
+ public void handleAlert(Page page, String message) {
+ throw new AssertionError("Alert dialog poped up: "+message);
+ }
+ });
+
// avoid a hang by setting a time out. It should be long enough to prevent
// false-positive timeout on slow systems
setTimeout(60*1000);
diff --git a/test/src/test/java/hudson/tasks/MailAddressResolverTest.java b/test/src/test/java/hudson/tasks/MailAddressResolverTest.java
deleted file mode 100644
index c969d4d8e4..0000000000
--- a/test/src/test/java/hudson/tasks/MailAddressResolverTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package hudson.tasks;
-
-import hudson.model.User;
-import hudson.tasks.Mailer.UserProperty;
-import org.jvnet.hudson.test.Bug;
-import org.jvnet.hudson.test.HudsonTestCase;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-public class MailAddressResolverTest extends HudsonTestCase {
- @Bug(5164)
- public void test5164() {
- Mailer.descriptor().setDefaultSuffix("@example.com");
- String a = User.get("DOMAIN\\user").getProperty(UserProperty.class).getAddress();
- assertEquals("user@example.com",a);
- }
-}
diff --git a/test/src/test/java/hudson/tasks/MailSenderTest.java b/test/src/test/java/hudson/tasks/MailSenderTest.java
deleted file mode 100644
index f2f0b9ee60..0000000000
--- a/test/src/test/java/hudson/tasks/MailSenderTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package hudson.tasks;
-
-import static org.mockito.Mockito.*;
-import hudson.model.AbstractBuild;
-import hudson.model.AbstractProject;
-import hudson.model.BuildListener;
-import hudson.model.Result;
-import hudson.model.User;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import com.google.common.collect.Sets;
-
-/**
- * Test case for the {@link MailSender}
- *
- * See also {@link MailerTest} for more tests for the mailer.
- *
- * @author Christoph Kutzinski
- */
-@SuppressWarnings("rawtypes")
-public class MailSenderTest {
-
- private AbstractBuild build;
- private AbstractBuild previousBuild;
-
- private AbstractBuild upstreamBuild;
- private AbstractBuild previousBuildUpstreamBuild;
- private AbstractBuild upstreamBuildBetweenPreviousAndCurrent;
-
- private AbstractProject upstreamProject;
- private BuildListener listener;
-
- @SuppressWarnings("unchecked")
- @Before
- public void before() throws IOException {
- this.upstreamProject = mock(AbstractProject.class);
-
- this.previousBuildUpstreamBuild = mock(AbstractBuild.class);
- this.upstreamBuildBetweenPreviousAndCurrent = mock(AbstractBuild.class);
- this.upstreamBuild = mock(AbstractBuild.class);
-
- createPreviousNextRelationShip(this.previousBuildUpstreamBuild, this.upstreamBuildBetweenPreviousAndCurrent,
- this.upstreamBuild);
-
-
-
- User user1 = mock(User.class);
- when(user1.getProperty(Mailer.UserProperty.class)).thenReturn(new Mailer.UserProperty("this.one.should.not.be.included@example.com"));
- Set badGuys1 = Sets.newHashSet(user1);
- when(this.previousBuildUpstreamBuild.getCulprits()).thenReturn(badGuys1);
-
- User user2 = mock(User.class);
- when(user2.getProperty(Mailer.UserProperty.class)).thenReturn(new Mailer.UserProperty("this.one.must.be.included@example.com"));
- Set badGuys2 = Sets.newHashSet(user2);
- when(this.upstreamBuildBetweenPreviousAndCurrent.getCulprits()).thenReturn(badGuys2);
-
- User user3 = mock(User.class);
- when(user3.getProperty(Mailer.UserProperty.class)).thenReturn(new Mailer.UserProperty("this.one.must.be.included.too@example.com"));
- Set badGuys3 = Sets.newHashSet(user3);
- when(this.upstreamBuild.getCulprits()).thenReturn(badGuys3);
-
-
- this.previousBuild = mock(AbstractBuild.class);
- when(this.previousBuild.getResult()).thenReturn(Result.SUCCESS);
- when(this.previousBuild.getUpstreamRelationshipBuild(this.upstreamProject)).thenReturn(this.previousBuildUpstreamBuild);
-
- this.build = mock(AbstractBuild.class);
- when(this.build.getResult()).thenReturn(Result.FAILURE);
- when(build.getUpstreamRelationshipBuild(upstreamProject)).thenReturn(this.upstreamBuild);
-
- createPreviousNextRelationShip(this.previousBuild, this.build);
-
- this.listener = mock(BuildListener.class);
- when(this.listener.getLogger()).thenReturn(System.out);
- }
-
- /**
- * Creates a previous/next relationship between the builds in the given order.
- */
- private static void createPreviousNextRelationShip(AbstractBuild... builds) {
- int max = builds.length - 1;
-
- for (int i = 0; i < builds.length; i++) {
- if (i < max) {
- when(builds[i].getNextBuild()).thenReturn(builds[i+1]);
- }
- }
-
- for (int i = builds.length - 1; i >= 0; i--) {
- if (i >= 1) {
- when(builds[i].getPreviousBuild()).thenReturn(builds[i-1]);
- }
- }
- }
-
- /**
- * Tests that all culprits from the previous builds upstream build (exclusive)
- * until the current builds upstream build (inclusive) are contained in the recipients
- * list.
- */
- @Test
- public void testIncludeUpstreamCulprits() throws Exception {
- Collection upstreamProjects = Collections.singleton(this.upstreamProject);
-
- MailSender sender = new MailSender("", false, false, "UTF-8", upstreamProjects);
- Set recipients = Sets.newHashSet();
- sender.includeCulpritsOf(upstreamProject, build, listener, recipients);
-
- assertEquals(2, recipients.size());
- assertFalse(recipients.contains(new InternetAddress("this.one.should.not.be.included@example.com")));
- assertTrue(recipients.contains(new InternetAddress("this.one.must.be.included@example.com")));
- assertTrue(recipients.contains(new InternetAddress("this.one.must.be.included.too@example.com")));
- }
-}
diff --git a/test/src/test/java/hudson/tasks/MailerTest.java b/test/src/test/java/hudson/tasks/MailerTest.java
deleted file mode 100644
index 01a349c5bc..0000000000
--- a/test/src/test/java/hudson/tasks/MailerTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-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;
-import org.jvnet.hudson.test.Email;
-import org.jvnet.mock_javamail.Mailbox;
-
-import javax.mail.Address;
-import javax.mail.internet.InternetAddress;
-
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-public class MailerTest extends HudsonTestCase {
- @Bug(1566)
- public void testSenderAddress() throws Exception {
- // intentionally give the whole thin in a double quote
- Mailer.descriptor().setAdminAddress("\"me \"");
-
- String recipient = "you ";
- Mailbox yourInbox = Mailbox.get(new InternetAddress(recipient));
- yourInbox.clear();
-
- // create a project to simulate a build failure
- FreeStyleProject project = createFreeStyleProject();
- project.getBuildersList().add(new FailureBuilder());
- Mailer m = new Mailer();
- m.recipients = recipient;
- project.getPublishersList().add(m);
-
- project.scheduleBuild2(0).get();
-
- assertEquals(1,yourInbox.size());
- Address[] senders = yourInbox.get(0).getFrom();
- assertEquals(1,senders.length);
- assertEquals("me ",senders[0].toString());
- }
-
- /**
- * Makes sure the use of "localhost" in the Hudson URL reports a warning.
- */
- public void testLocalHostWarning() throws Exception {
- HtmlPage p = new WebClient().goTo("configure");
- HtmlInput url = p.getFormByName("config").getInputByName("_.url");
- url.setValueAttribute("http://localhost:1234/");
- assertTrue(p.getDocumentElement().getTextContent().contains("instead of localhost"));
- }
-
- @Email("http://www.nabble.com/email-recipients-disappear-from-freestyle-job-config-on-save-to25479293.html")
- public void testConfigRoundtrip() throws Exception {
- Mailer m = new Mailer();
- m.recipients = "kk@kohsuke.org";
- m.dontNotifyEveryUnstableBuild = true;
- m.sendToIndividuals = true;
- verifyRoundtrip(m);
-
- m = new Mailer();
- m.recipients = "";
- m.dontNotifyEveryUnstableBuild = false;
- m.sendToIndividuals = false;
- verifyRoundtrip(m);
- }
-
- private void verifyRoundtrip(Mailer before) throws Exception {
- FreeStyleProject p = createFreeStyleProject();
- p.getPublishersList().add(before);
- submit(new WebClient().getPage(p,"configure").getFormByName("config"));
- Mailer after = p.getPublishersList().get(Mailer.class);
- assertNotSame(before,after);
- assertEqualBeans(before,after,"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);
- d.setSmtpAuth(null,null);
- submit(new WebClient().goTo("configure").getFormByName("config"));
- assertEquals(false,d.getUseSsl());
- assertNull("expected null, got: " + d.getSmtpAuthUserName(), d.getSmtpAuthUserName());
- assertNull("expected null, got: " + d.getSmtpAuthPassword(), d.getSmtpAuthPassword());
- }
-}
diff --git a/test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java b/test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java
new file mode 100644
index 0000000000..9a0d0d56fb
--- /dev/null
+++ b/test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java
@@ -0,0 +1,20 @@
+package jenkins.model;
+
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.jvnet.hudson.test.HudsonTestCase;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class JenkinsLocationConfigurationTest extends HudsonTestCase {
+ /**
+ * Makes sure the use of "localhost" in the Hudson URL reports a warning.
+ */
+ public void testLocalHostWarning() throws Exception {
+ HtmlPage p = new WebClient().goTo("configure");
+ HtmlInput url = p.getFormByName("config").getInputByName("_.url");
+ url.setValueAttribute("http://localhost:1234/");
+ assertTrue(p.getDocumentElement().getTextContent().contains("instead of localhost"));
+ }
+}
diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml
index d9c2936b77..6a5c943f7a 100644
--- a/ui-samples-plugin/pom.xml
+++ b/ui-samples-plugin/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
pom
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
ui-samples-plugin
@@ -44,20 +44,20 @@ THE SOFTWARE.
${project.version}
provided
-
-
- org.jenkins-ci.main
- jenkins-test-harness
- ${project.version}
- test
-
-
- org.jenkins-ci.main
- jenkins-war
- war
- ${project.version}
- test
-
+
+
+ org.jenkins-ci.main
+ jenkins-test-harness
+ ${project.version}
+ test
+
+
+ org.jenkins-ci.main
+ jenkins-war
+ war
+ ${project.version}
+ test
+
javax.servlet
servlet-api
diff --git a/war/pom.xml b/war/pom.xml
index c9aa2dfefb..460cd7df7d 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
pom
- 1.494-SNAPSHOT
+ 1.495-SNAPSHOT
../pom.xml
@@ -316,6 +316,12 @@ THE SOFTWARE.
1.0
hpi
+
+ org.jenkins-ci.plugins
+ mailer
+ 1.4-SNAPSHOT
+ hpi
+
${project.build.directory}/${project.build.finalName}/WEB-INF/plugins
true
diff --git a/war/src/main/webapp/images/16x16/secure.png b/war/src/main/webapp/images/16x16/secure.png
new file mode 100644
index 0000000000..3f97bbbbd8
Binary files /dev/null and b/war/src/main/webapp/images/16x16/secure.png differ
diff --git a/war/src/main/webapp/images/24x24/lock.png b/war/src/main/webapp/images/24x24/lock.png
new file mode 100644
index 0000000000..72a8b14a9d
Binary files /dev/null and b/war/src/main/webapp/images/24x24/lock.png differ
diff --git a/war/src/main/webapp/images/24x24/secure.png b/war/src/main/webapp/images/24x24/secure.png
new file mode 100644
index 0000000000..1a03cc3c2a
Binary files /dev/null and b/war/src/main/webapp/images/24x24/secure.png differ
diff --git a/war/src/main/webapp/images/32x32/lock.png b/war/src/main/webapp/images/32x32/lock.png
new file mode 100644
index 0000000000..c20b0021f2
Binary files /dev/null and b/war/src/main/webapp/images/32x32/lock.png differ
diff --git a/war/src/main/webapp/images/32x32/secure.png b/war/src/main/webapp/images/32x32/secure.png
new file mode 100644
index 0000000000..5e06c8db79
Binary files /dev/null and b/war/src/main/webapp/images/32x32/secure.png differ
diff --git a/war/src/main/webapp/images/48x48/lock.png b/war/src/main/webapp/images/48x48/lock.png
new file mode 100644
index 0000000000..9e11e32eb0
Binary files /dev/null and b/war/src/main/webapp/images/48x48/lock.png differ
diff --git a/war/src/main/webapp/images/48x48/secure.png b/war/src/main/webapp/images/48x48/secure.png
index 95f214d932..2b201553f0 100644
Binary files a/war/src/main/webapp/images/48x48/secure.png and b/war/src/main/webapp/images/48x48/secure.png differ