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 e9e97621b7d4e47a5162e306ff4ff66b94bf4f9d..0000000000000000000000000000000000000000
--- 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 3ceff0a419bfbe2ca3dec5c07927259dc2d15ba0..f09a1c7247e3956e080f6be015d3fa59b15f88ab 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 60e26c9c5320a4da285c9fa674e968bb9d2614f9..4206884acbed3c9e4d2182d8266ce81296f981ea 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/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 955eaf7f2db43668998aeaa9a131a47d9935eaeb..ce02dca7228e6275b9081f8c982d8f92dd692629 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/Run.java b/core/src/main/java/hudson/model/Run.java
index c5de1ea5ef0f22832d1a120c7d7f092f5147b193..55b7bb89335e48b5a372dd162a33ea830c764aad 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
* 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/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index 7c3a24282495a6bf3842aba7232430df91529fd4..cb1ce711e7b247f487be954000ea8af36e75ab12 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/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a99ed5eca01299a4e8c140fd4324638f1e47427c..0109b580280e7403bc5effaec2ea3748c3695cc2 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 0000000000000000000000000000000000000000..4ee356ac66da3c0746afadd62e2d6a331841ed16
--- /dev/null
+++ b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
@@ -0,0 +1,77 @@
+package jenkins.model;
+
+import hudson.Extension;
+import hudson.XmlFile;
+import net.sf.json.JSONObject;
+import org.kohsuke.stapler.StaplerRequest;
+
+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() {
+ return adminAddress;
+ }
+
+ public void setAdminAddress(String adminAddress) {
+ this.adminAddress = adminAddress;
+ save();
+ }
+
+ public String getUrl() {
+ return hudsonUrl;
+ }
+
+ public void setUrl(String hudsonUrl) {
+ this.hudsonUrl = hudsonUrl;
+ save();
+ }
+
+ @Override
+ public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+ req.bindJSON(this,json);
+ return true;
+ }
+
+ private static final Logger LOGGER = Logger.getLogger(JenkinsLocationConfiguration.class.getName());
+}
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 0000000000000000000000000000000000000000..fc1fcd6f1c7f5c6b7d6c226b0a94753384520ec2
--- /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/jenkins/model/JenkinsLocationConfiguration/config_da.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
new file mode 100644
index 0000000000000000000000000000000000000000..731a6249df7f3eae5fa14d3a1b89eed527153b26
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
@@ -0,0 +1,24 @@
+# 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.
+
+System\ Admin\ E-mail\ Address=Systemadministratorens E-mail adresse
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
new file mode 100644
index 0000000000000000000000000000000000000000..3bd361d5b6b509afbb8e1e405ebfe369041d09d2
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
@@ -0,0 +1,24 @@
+# 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.
+
+System\ Admin\ E-mail\ Address=E-Mail-Adresse des Systemadministrators
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_es.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_es.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f12fe2f32279dd37b0f74d4889e58de2887a3d82
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_es.properties
@@ -0,0 +1,24 @@
+# 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.
+
+Jenkins\ URL=Dirección web de Jenkins
+Sender\ E-mail\ Address=Dirección de remitente
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b3ccab7f21de7e749c58388ddaae5bcfda69f5d4
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
@@ -0,0 +1,24 @@
+# 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.
+
+System\ Admin\ E-mail\ Address=Adresse email de l''administrateur syst\u00cbme
+Jenkins\ URL=URL de Jenkins
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ja.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ja.properties
new file mode 100644
index 0000000000000000000000000000000000000000..9a0d47cdeed5b00e5e3172b723de292f7eec62f3
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ja.properties
@@ -0,0 +1,38 @@
+# The MIT License
+#
+# Copyright (c) 2004-2012, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
+#
+# 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 \u901a\u77e5
+SMTP\ server=SMTP\u30b5\u30fc\u30d0\u30fc
+Default\ user\ e-mail\ suffix=E-mail\u306e\u30b5\u30d5\u30a3\u30c3\u30af\u30b9
+Sender\ E-mail\ Address=\u9001\u4fe1\u5143\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9
+Jenkins\ URL=Jenkins URL
+Use\ SMTP\ Authentication=SMTP\u8a8d\u8a3c
+User\ Name=\u30e6\u30fc\u30b6\u30fc\u540d
+Password=\u30d1\u30b9\u30ef\u30fc\u30c9
+Use\ SSL=SSL
+SMTP\ Port=SMTP\u30dd\u30fc\u30c8
+Charset=\u6587\u5b57\u30bb\u30c3\u30c8
+Reply-To\ Address=\u8fd4\u4fe1\u5148\u30a2\u30c9\u30ec\u30b9
+
+Test\ configuration\ by\ sending\ test\ e-mail=\u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3057\u3066\u8a2d\u5b9a\u3092\u78ba\u8a8d
+Test\ e-mail\ recipient=\u30c6\u30b9\u30c8\u30e1\u30fc\u30eb\u306e\u5b9b\u5148
+Test\ configuration=\u8a2d\u5b9a\u3092\u78ba\u8a8d
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ed081a0ab95c99b31ed35de8b786d29c1191be21
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
@@ -0,0 +1,24 @@
+# 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.
+
+System\ Admin\ E-mail\ Address=E-mail systeemadministrator
+Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
new file mode 100644
index 0000000000000000000000000000000000000000..64d05ebaa23b5fe77190481e0030e2a606f77e73
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
@@ -0,0 +1,24 @@
+# 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.
+
+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/jenkins/model/JenkinsLocationConfiguration/config_ru.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b9c41aa46a99fee614aef03ffd08b77066661cba
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
@@ -0,0 +1,24 @@
+# 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.
+
+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/jenkins/model/JenkinsLocationConfiguration/config_tr.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4b5c74527a149359d18c2207e87f7718f3059c1a
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
@@ -0,0 +1,24 @@
+# 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.
+
+System\ Admin\ E-mail\ Address=Sistem\ Admin\ e-posta\ Adresi
+Jenkins\ URL=Jenkins\ URL'i
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..c3df1aaf7999f48757ab5c1c01fd01fba986e9b7
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
@@ -0,0 +1,24 @@
+# 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.
+
+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/jenkins/model/JenkinsLocationConfiguration/help-adminAddress.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress.html
new file mode 100644
index 0000000000000000000000000000000000000000..99444f8bfa872dff7380271d26b88e71f7d6d827
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress.html
@@ -0,0 +1,5 @@
+
+ Notification e-mails from Jenkins to project owners will be sent
+ with this address in the from header. This can be just
+ "foo@acme.org" or it could be something like "Jenkins Daemon <foo@acme.org>"
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_de.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_de.html
new file mode 100644
index 0000000000000000000000000000000000000000..50fe2009f0dd26960557fd89dc8255a6b7869382
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_de.html
@@ -0,0 +1,7 @@
+
+ Jenkins schickt E-Mail-Benachrichtigungen an Projekteigner unter dieser Adresse
+ im "From"-Header.
+
+ Sie können einfach nur "foo@acme.org" angeben, aber auch etwas in
+ der Richtung wie "Jenkins Daemon <foo@acme.org>"
+
+ Les emails de notification envoyés par Jenkins aux propriétaires des
+ projets seront envoyés avec cette adresse dans le champ expéditeur.
+ Cela peut être simplement "foo@acme.org" ou quelque chose comme
+ "Jenkins Daemon <foo@acme.org>"
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ja.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ja.html
new file mode 100644
index 0000000000000000000000000000000000000000..3a2157c17441fe47d0aa9400424ac5aea183ab73
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ja.html
@@ -0,0 +1,4 @@
+
+ Jenkinsからプロジェクト管理者へのE-mail通知は、Fromヘッダにこのアドレスを設定して送信されます。
+ "foo@acme.org"や、"Jenkins Daemon <foo@acme.org>"のような形式で設定します。
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_nl.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_nl.html
new file mode 100644
index 0000000000000000000000000000000000000000..b11b281f8e97879f8899346572e66a99a32b0b67
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_nl.html
@@ -0,0 +1,4 @@
+
+ Notificatie e-mails van Jenkins zullen met dit "van" adres verstuurd worden.
+ Dit kan gewoon "foo@acme.org" of zelfs "Jenkins Daemon <foo@acme.org>" zijn.
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_pt_BR.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_pt_BR.html
new file mode 100644
index 0000000000000000000000000000000000000000..e4b245a7446d85f801b056bd055eee75707f421c
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_pt_BR.html
@@ -0,0 +1,5 @@
+
+ E-mails de notificação do Jenkins para os proprietários do projeto serão enviados
+ com este endereço no remetente. Pode ser apenas
+ "foo@acme.org" ou poderia ser algo como "Servidor Jenkins <foo@acme.org>"
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ru.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ru.html
new file mode 100644
index 0000000000000000000000000000000000000000..28eaeb1ac57be2c7ae13ad2c8f2dc4d1f61746e4
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_ru.html
@@ -0,0 +1,5 @@
+
+ Уведомления от Jenkins адресатам проекта будут отправлены с этим адресом в поле From.
+ Это может быть просто "user@domain.com" или что-то более осмысленное, например,
+ "Jenkins Daemon <daemon@myjenkinsserver.domain.org>".
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_tr.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_tr.html
new file mode 100644
index 0000000000000000000000000000000000000000..a430e9783ae2cf7fef91b1b784f10caa430b14a9
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_tr.html
@@ -0,0 +1,5 @@
+
+ Proje sahiplerine, bilgilendirmeler burada yazan mail adresi ile
+ gönderilecektir. "foo@acme.org" veya "Jenkins Daemon <foo@acme.org>"
+ şeklinde adresler yazılabilir.
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_zh_CN.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_zh_CN.html
new file mode 100644
index 0000000000000000000000000000000000000000..39856ab85b1a9fc17f232a9231318a814c1f0c67
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-adminAddress_zh_CN.html
@@ -0,0 +1,3 @@
+
+ Jenkins将用这个地址发送通知邮件给项目拥有者.这里可以填写"foo@acme.org"或者像"Jenkins Daemon <foo@acme.org>"形式的内容.
+
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url.html b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url.html
new file mode 100644
index 0000000000000000000000000000000000000000..a2a83aa04f5260b8b521fcb5d67f3379837573c8
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/help-url.html
@@ -0,0 +1,10 @@
+
+ Optionally specify the HTTP address of the Jenkins installation, such
+ as
http://yourhost.yourdomain/jenkins/. This value is used to
+ let Jenkins know how to refer to itself, ie. to display images or to
+ create links in emails.
+
+
+ This is necessary because Jenkins cannot reliably detect such a URL
+ from within itself.
+
+ Optional: Geben Sie hier die HTTP-Adresse der Jenkins-Instanz an, z.B:
+
http://yourhost.yourdomain/jenkins/. Dieser Wert wird verwendet,
+ um Links in E-Mail-Benachrichtigungen einzufügen.
+
+
+
+ Dies ist notwendig, weil Jenkins nicht zuverlässig seine eigene URL
+ feststellen kann.
+
+ Spécifie optionnellement l'adresse HTTP de l'installation de Jenkins,
+ comme
http://yourhost.yourdomain/jenkins/.
+ Cette valeur est utilisée pour mettre des liens dans les emails envoyés
+ par Jenkins.
+
+
+ Cela est nécessaire parce que Jenkins ne peut pas détecter de façon
+ fiable sa propre URL.
+
+ JenkinsのURLアドレスを指定(任意)します(例
http://yourhost.yourdomain/jenkins/)。
+ この値を使用して、Jenkinsが送信するE-mailにリンクを記述します。
+
+
+ この値は、Jenkins自身ではURLを確実に検出できないため必要です。
+
+ Optioneel u kunt het HTTP adres van uw Jenkins instantie
+ (v.b.
http://uwnode.uwdomein/jenkins/) opgeven. Deze waarde
+ zal gebruikt worden voor het genereren van webreferenties in de e-mails die
+ Jenkins uitstuurt.
+
+
+ Dit is nodig omdat Jenkins niet op een betrouwbare manier z'n eigen URL kan
+ detecteren.
+
+ Opcionalmente, especifique o endereço HTTP da instalação do Jenkins, tal
+ como
http://seuhost.seudominio/jenkins/. Este valor é usado para
+ por links nos e-mails gerados pelo Jenkins.
+
+
+ Isto é necessário porque o Jenkins não pode resolver tal URL
+ de dentre dele mesmo.
+
+ Укажите адрес текущей инсталляции Jenkins в виде
http://yourhost.yourdomain:8080/jenkins/.
+ Это значение бодет использоваться для генерации ссылок из сообщений в
+ Jenkins. (опционально)
+
+
+ Это требуется потому, что сам Jenkins не может достоверно определить свой URL.
+
+ Jenkins kurulumunuzun HTTP adresini,
http://yourhost.yourdomain/jenkins/
+ şeklinde burada belirtebilirsiniz, böylelikle e-posta içerisinde Jenkins ile ilgili
+ linkler bu URL yardımı ile oluşturulacaktır.
+
+
+ Jenkins, kendi URL'ini güvenilir bir şekilde tespit edemeyeceği için, bu kısmı doldurmanız
+ gereklidir.
+
+ 此项是可选的,指定安装Jenkins的HTTP地址,例如
http://yourhost.yourdomain/jenkins/.
+ 这个值用来在邮件中生产Jenkins链接.
+
+
+ 此项是有必要的,因为Jenkins无法探测到自己的URL地址.
+