+ JENKINS_HOME layout change: builds are now keyed by build numbers and not timestamps.
+ See Wiki for details
+ and downgrade.
+ (issue 24380)
+
+ Do not throw exception on /signup when not possible.
+ (issue 11172)
+
+ Tool installer which downloads and unpacks archives should not fail the build if the tool already exists and the server returns an error code.
+ (issue 26196)
+
- Improved the /cli help screen.
+ Improved the /cli help screen.
(issue 20023)
Polling-triggered jobs get scheduled en-mass on start-up if slaves aren't online yet.
@@ -1344,7 +1397,7 @@ Upcoming changes
issue 18879,
issue 19619)
- Upgrade bundled iplugin versions: ssh-slaves to 1.4, ssh-credentials to 1.5.3 and
+ Upgrade bundled iplugin versions: ssh-slaves to 1.4, ssh-credentials to 1.5.3 and
credentials to 1.8.3
(issue 19945)
@@ -1934,7 +1987,7 @@ Upcoming changes
”My Views" links leads to 404 Not Found.
(issue 17317)
- Quoting Issue with JDK Installer with Windows Installer.
+ Quoting Issue with JDK Installer with Windows Installer.
(issue 5408)
Restored compatibility in ArtifactArchiver signature; broken in 1.509 and could affect plugins.
@@ -2010,7 +2063,7 @@ Upcoming changes
ChangeLog should produce some output even if some (plugin) annotator fails
(issue 17084)
- View name should not allow "..".
+ View name should not allow "..".
(issue 16608)
diff --git a/cli/pom.xml b/cli/pom.xml
index 41afe85d6befd503cebb3b5238f1f67630001879..9e3d92ea686c80e240c3092e627279c4bd4d7887 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -3,14 +3,15 @@
4.0.0
- pomorg.jenkins-ci.main
- 1.594-SNAPSHOT
+ pom
+ 1.598-SNAPSHOTcli
- Jenkins CLI
+ Jenkins cli
+ Command line interface for Jenkins
@@ -93,5 +94,4 @@
-
diff --git a/core/pom.xml b/core/pom.xml
index f417985049ada374b2425298673ce800feb6af14..e1093edab6fd5c5d2481387f8c8a44659f5bf53a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,3 +1,4 @@
+
-
4.0.0org.jenkins-ci.mainpom
- 1.594-SNAPSHOT
- ../pom.xml
+ 1.598-SNAPSHOTjenkins-coreJenkins core
-
- Contains the core Jenkins code and view files to render HTML.
-
+ Jenkins core code and view files to render HTML.true
- 1.233
+ 1.2342.5.6.SEC031.8.9
@@ -51,7 +48,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins.icon-shimicon-set
- 1.0.3
+ 1.0.5${project.groupId}
@@ -862,7 +859,7 @@ THE SOFTWARE.
-
+
findbugs
@@ -880,9 +877,7 @@ THE SOFTWARE.
-
+
cobertura
diff --git a/core/src/main/grammar/crontab.g b/core/src/main/grammar/crontab.g
index f52aaf571cfa31cde464d59bf07f467a8bbcf513..4ace2d3adf9c8db2468a225a97632954c166ac21 100644
--- a/core/src/main/grammar/crontab.g
+++ b/core/src/main/grammar/crontab.g
@@ -110,7 +110,7 @@ throws ANTLRException
}
| ("H" "(")=> "H" "(" s=token "-" e=token ")" ( "/" d=token )?
{
- bits = doHash(s,e,d);
+ bits = doHash(s,e,d,field);
}
| "H" ( "/" d=token )?
{
diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index b2d61ead561da8fdabe82bb65a6c8aee46ff630e..c0047b557836d7865e14c4f9ee7919d04dd39c4b 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -359,6 +359,7 @@ public class EnvVars extends TreeMap {
/**
* Add a key/value but only if the value is not-null. Otherwise no-op.
+ * @since 1.556
*/
public void putIfNotNull(String key, String value) {
if (value!=null)
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 74760a428837196561c45e208655dbba31d6448b..fbbc89e876e1cd471bcd7d526200359151604e81 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -734,32 +734,34 @@ public final class FilePath implements Serializable {
* that supports upgrade and downgrade. Specifically,
*
*
- *
If the target directory doesn't exist {@linkplain #mkdirs() it'll be created}.
- *
The timestamp of the .tgz file is left in the installation directory upon extraction.
- *
If the timestamp left in the directory doesn't match with the timestamp of the current archive file,
+ *
If the target directory doesn't exist {@linkplain #mkdirs() it will be created}.
+ *
The timestamp of the archive is left in the installation directory upon extraction.
+ *
If the timestamp left in the directory does not match the timestamp of the current archive file,
* the directory contents will be discarded and the archive file will be re-extracted.
*
If the connection is refused but the target directory already exists, it is left alone.
*
*
* @param archive
- * The resource that represents the tgz/zip file. This URL must support the "Last-Modified" header.
- * (Most common usage is to get this from {@link ClassLoader#getResource(String)})
+ * The resource that represents the tgz/zip file. This URL must support the {@code Last-Modified} header.
+ * (For example, you could use {@link ClassLoader#getResource}.)
* @param listener
* If non-null, a message will be printed to this listener once this method decides to
- * extract an archive.
+ * extract an archive, or if there is any issue.
+ * @param message a message to be printed in case extraction will proceed.
* @return
* true if the archive was extracted. false if the extraction was skipped because the target directory
* was considered up to date.
* @since 1.299
*/
- public boolean installIfNecessaryFrom(URL archive, TaskListener listener, String message) throws IOException, InterruptedException {
+ public boolean installIfNecessaryFrom(@Nonnull URL archive, @CheckForNull TaskListener listener, @Nonnull String message) throws IOException, InterruptedException {
try {
FilePath timestamp = this.child(".timestamp");
+ long lastModified = timestamp.lastModified();
URLConnection con;
try {
con = ProxyConfiguration.open(archive);
- if (timestamp.exists()) {
- con.setIfModifiedSince(timestamp.lastModified());
+ if (lastModified != 0) {
+ con.setIfModifiedSince(lastModified);
}
con.connect();
} catch (IOException x) {
@@ -774,15 +776,21 @@ public final class FilePath implements Serializable {
}
}
- if (con instanceof HttpURLConnection
- && ((HttpURLConnection)con).getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
- return false;
+ if (lastModified != 0 && con instanceof HttpURLConnection) {
+ HttpURLConnection httpCon = (HttpURLConnection) con;
+ int responseCode = httpCon.getResponseCode();
+ if (responseCode == HttpURLConnection.HTTP_NOT_MODIFIED) {
+ return false;
+ } else if (responseCode != HttpURLConnection.HTTP_OK) {
+ listener.getLogger().println("Skipping installation of " + archive + " to " + remote + " due to server error: " + responseCode + " " + httpCon.getResponseMessage());
+ return false;
+ }
}
long sourceTimestamp = con.getLastModified();
if(this.exists()) {
- if(timestamp.exists() && sourceTimestamp ==timestamp.lastModified())
+ if (lastModified != 0 && sourceTimestamp == lastModified)
return false; // already up to date
this.deleteContents();
} else {
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index d2918a7aa4b1c6c5ed307492bb2a41ce1eef6dd9..41605eed99865a7a0d5f94d134256e80c1f9398e 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -1,18 +1,18 @@
/*
* The MIT License
- *
+ *
* Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Stephen Connolly, Tom Huybrechts
- *
+ *
* 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
@@ -175,7 +175,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
* as the 2nd part can be repeated for each Hudson instance.
*/
private boolean pluginListed = false;
-
+
/**
* Strategy for creating and initializing plugins
*/
@@ -192,7 +192,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
this.rootDir = rootDir;
if(!rootDir.exists())
rootDir.mkdirs();
-
+
strategy = createPluginStrategy();
// load up rules for the core first
@@ -297,18 +297,18 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
r.add(p);
}
}
-
+
@Override
protected void reactOnCycle(PluginWrapper q, List cycle)
throws hudson.util.CyclicGraphDetector.CycleDetectedException {
-
+
LOGGER.log(Level.SEVERE, "found cycle in plugin dependencies: (root="+q+", deactivating all involved) "+Util.join(cycle," -> "));
for (PluginWrapper pluginWrapper : cycle) {
pluginWrapper.setHasCycleDependency(true);
failedPlugins.add(new FailedPlugin(pluginWrapper.getShortName(), new CycleDetectedException(cycle)));
}
}
-
+
};
cgd.run(getPlugins());
@@ -410,7 +410,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
/*
* contains operation that considers xxx.hpi and xxx.jpi as equal
- * this is necessary since the bundled plugins are still called *.hpi
+ * this is necessary since the bundled plugins are still called *.hpi
*/
private boolean containsHpiJpi(Collection bundledPlugins, String name) {
return bundledPlugins.contains(name.replaceAll("\\.hpi",".jpi"))
@@ -484,7 +484,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
} catch (ReactorException e) {
throw new IOException("Failed to initialize "+ sn +" plugin",e);
}
-
+
// recalculate dependencies of plugins optionally depending the newly deployed one.
for (PluginWrapper depender: plugins) {
if (depender.equals(p)) {
@@ -504,8 +504,8 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
}
}
-
- LOGGER.info("Plugin " + sn + " dynamically installed");
+
+ LOGGER.info("Plugin " + p.getShortName()+":"+p.getVersion() + " dynamically installed");
}
/**
@@ -532,7 +532,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
// normalization first, if the old file exists.
rename(new File(rootDir,legacyName),file);
rename(new File(rootDir,legacyName+".pinned"),pinFile);
-
+
// update file if:
// - no file exists today
// - bundled version and current version differs (by timestamp), and the file isn't pinned.
@@ -589,7 +589,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
/**
- * Creates a hudson.PluginStrategy, looking at the corresponding system property.
+ * Creates a hudson.PluginStrategy, looking at the corresponding system property.
*/
protected PluginStrategy createPluginStrategy() {
String strategyName = System.getProperty(PluginStrategy.class.getName());
@@ -602,7 +602,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
LOGGER.info("Plugin strategy: " + strategyName);
return (PluginStrategy) strategy;
} else {
- LOGGER.warning("Plugin strategy (" + strategyName +
+ LOGGER.warning("Plugin strategy (" + strategyName +
") is not an instance of hudson.PluginStrategy");
}
} catch (ClassNotFoundException e) {
@@ -614,7 +614,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
LOGGER.info("Falling back to ClassicPluginStrategy");
}
-
+
// default and fallback
return new ClassicPluginStrategy(this);
}
@@ -801,7 +801,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
rsp.sendRedirect("../updateCenter/");
}
-
+
/**
* Bare-minimum configuration mechanism to change the update center.
@@ -816,7 +816,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
sites.remove(s);
}
sites.add(new UpdateSite(UpdateCenter.ID_DEFAULT, site));
-
+
return HttpResponses.redirectToContextRoot();
}
@@ -835,7 +835,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
return new HttpRedirect("advanced");
}
-
+
/**
* Uploads a plugin.
*/
@@ -851,8 +851,8 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
if("".equals(fileName)){
return new HttpRedirect("advanced");
}
- // we allow the upload of the new jpi's and the legacy hpi's
- if(!fileName.endsWith(".jpi") && !fileName.endsWith(".hpi")){
+ // we allow the upload of the new jpi's and the legacy hpi's
+ if(!fileName.endsWith(".jpi") && !fileName.endsWith(".hpi")){
throw new Failure(hudson.model.Messages.Hudson_NotAPlugin(fileName));
}
@@ -1175,10 +1175,10 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
private static final Logger LOGGER = Logger.getLogger(PluginManager.class.getName());
public static boolean FAST_LOOKUP = !Boolean.getBoolean(PluginManager.class.getName()+".noFastLookup");
-
+
public static final Permission UPLOAD_PLUGINS = new Permission(Jenkins.PERMISSIONS, "UploadPlugins", Messages._PluginManager_UploadPluginsPermission_Description(),Jenkins.ADMINISTER,PermissionScope.JENKINS);
public static final Permission CONFIGURE_UPDATECENTER = new Permission(Jenkins.PERMISSIONS, "ConfigureUpdateCenter", Messages._PluginManager_ConfigureUpdateCenterPermission_Description(),Jenkins.ADMINISTER,PermissionScope.JENKINS);
-
+
/**
* Remembers why a plugin failed to deploy.
*/
@@ -1202,17 +1202,17 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
/*package*/ static final class PluginInstanceStore {
final Map store = new Hashtable();
}
-
+
/**
* {@link AdministrativeMonitor} that checks if there are any plugins with cycle dependencies.
*/
@Extension
public static final class PluginCycleDependenciesMonitor extends AdministrativeMonitor {
-
+
private transient volatile boolean isActive = false;
-
- private transient volatile List pluginsWithCycle;
-
+
+ private transient volatile List pluginsWithCycle;
+
public boolean isActivated() {
if(pluginsWithCycle == null){
pluginsWithCycle = new ArrayList();
@@ -1230,16 +1230,16 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
return pluginsWithCycle;
}
}
-
+
/**
* {@link AdministrativeMonitor} that informs the administrator about a required plugin update.
* @since 1.491
*/
@Extension
public static final class PluginUpdateMonitor extends AdministrativeMonitor {
-
+
private Map pluginsToBeUpdated = new HashMap();
-
+
/**
* Convenience method to ease access to this monitor, this allows other plugins to register required updates.
* @return this monitor.
@@ -1247,10 +1247,10 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
public static final PluginUpdateMonitor getInstance() {
return ExtensionList.lookup(PluginUpdateMonitor.class).get(0);
}
-
+
/**
* Report to the administrator if the plugin with the given name is older then the required version.
- *
+ *
* @param pluginName shortName of the plugin (artifactId)
* @param requiredVersion the lowest version which is OK (e.g. 2.2.2)
* @param message the message to show (plain text)
@@ -1267,20 +1267,20 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
public boolean isActivated() {
return !pluginsToBeUpdated.isEmpty();
}
-
+
/**
- * adds a message about a plugin to the manage screen
+ * adds a message about a plugin to the manage screen
* @param pluginName the plugins name
* @param message the message to be displayed
*/
public void addPluginToUpdate(String pluginName, String message) {
this.pluginsToBeUpdated.put(pluginName, new PluginUpdateInfo(pluginName, message));
}
-
+
public Collection getPluginsToBeUpdated() {
return pluginsToBeUpdated.values();
}
-
+
public static class PluginUpdateInfo {
public final String pluginName;
public final String message;
@@ -1290,5 +1290,5 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
}
- }
+ }
}
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index fa327c23d045ac39a046e8286a4d2ba730a982d1..4da0cc2ef6664111466a90e47f0d9422c295db51 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1451,9 +1451,9 @@ public abstract class AbstractProject
,R extends A
// OTOH, if a concurrent build is chosen, the user is willing to create a multiple workspace,
// so better throughput is achieved over time (modulo the initial cost of creating that many workspaces)
// by having multiple workspaces
- WorkspaceList.Lease lease = l.acquire(ws, !concurrentBuild);
Node node = lb.getBuiltOn();
Launcher launcher = ws.createLauncher(listener).decorateByEnv(getEnvironment(node,listener));
+ WorkspaceList.Lease lease = l.acquire(ws, !concurrentBuild);
try {
listener.getLogger().println("Polling SCM changes on " + node.getSelfLabel().getName());
LOGGER.fine("Polling SCM changes of " + getName());
@@ -1836,13 +1836,14 @@ public abstract class AbstractProject
,R extends A
else
scmCheckoutStrategy = null;
- if(req.hasParameter("_.assignedLabelString")) {
+ if(json.optBoolean("hasSlaveAffinity", json.has("label"))) {
+ assignedNode = Util.fixEmptyAndTrim(json.optString("label"));
+ } else if(req.hasParameter("_.assignedLabelString")) {
// Workaround for JENKINS-25372 while plugin is being updated.
+ // Keep this condition second for JENKINS-25533
LOGGER.log(Level.WARNING, "label assignment is using legacy '_.assignedLabelString'");
assignedNode = Util.fixEmptyAndTrim(req.getParameter("_.assignedLabelString"));
- } else if(json.optBoolean("hasSlaveAffinity", json.has("label"))) {
- assignedNode = Util.fixEmptyAndTrim(json.optString("label"));
- } else {
+ } else {
assignedNode = null;
}
canRoam = assignedNode==null;
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index bb6eeb2126d0a32732b8039b745b341ec299faa4..2b5bcef0cf608b16b8759371d0929c48406e61be 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -909,7 +909,11 @@ public abstract class Descriptor> implements Saveable {
if (formData!=null) {
for (Object o : JSONArray.fromObject(formData)) {
JSONObject jo = (JSONObject)o;
- String kind = jo.getString("kind");
+ String kind = jo.optString("$class", null);
+ if (kind == null) {
+ // Legacy: Remove once plugins have been staged onto $class
+ kind = jo.getString("kind");
+ }
Descriptor d = find(descriptors, kind);
if (d != null) {
items.add(d.newInstance(req, jo));
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 7020de7ee3471361fb6a011ba5d462e676df9a54..2addad98b0c80bfdb91d297829ea9c7cc5162005 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -105,7 +105,10 @@ import javax.annotation.Nonnull;
import static javax.servlet.http.HttpServletResponse.*;
import jenkins.model.ModelObjectWithChildren;
+import jenkins.model.RunIdMigrator;
import jenkins.model.lazy.LazyBuildMixIn;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
/**
* A job is an runnable entity under the monitoring of Hudson.
@@ -162,6 +165,9 @@ public abstract class Job, RunT extends Run> properties = new CopyOnWriteList>();
+ @Restricted(NoExternalUse.class)
+ public transient RunIdMigrator runIdMigrator;
+
protected Job(ItemGroup parent, String name) {
super(parent, name);
}
@@ -172,11 +178,21 @@ public abstract class Job, RunT extends Run parent, String name)
throws IOException {
super.onLoad(parent, name);
+ File buildDir = getBuildDir();
+ runIdMigrator = new RunIdMigrator();
+ runIdMigrator.migrate(buildDir, Jenkins.getInstance().getRootDir());
+
TextFile f = getNextBuildNumberFile();
if (f.exists()) {
// starting 1.28, we store nextBuildNumber in a separate file.
@@ -188,7 +204,7 @@ public abstract class Job, RunT extends Run, RunT extends Run
* The actual meaning and the purpose of parameters are entirely up to users, so
- * what the concrete parameter implmentation is pluggable. Write subclasses
+ * what the concrete parameter implementation is pluggable. Write subclasses
* in a plugin and put {@link Extension} on the descriptor to register them.
*
*
- * {@link ParameterDefinition} class uses config.jelly to provide contribute a form
- * fragment in the job configuration screen. Values entered there is fed back to
+ * {@link ParameterDefinition} class uses config.jelly to contribute a form
+ * fragment in the job configuration screen. Values entered there are fed back to
* {@link ParameterDescriptor#newInstance(StaplerRequest, JSONObject)} to create {@link ParameterDefinition}s.
*
*
index.jelly
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index cb42935e4f223f30bdf3e60e4a10e20dae8f0516..8686716dce1352db3c2e07fb04a7b1ca41225f23 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -47,6 +47,7 @@ import hudson.model.Descriptor.FormException;
import hudson.model.Run.RunExecution;
import hudson.model.listeners.RunListener;
import hudson.model.listeners.SaveableListener;
+import hudson.model.queue.SubTask;
import hudson.search.SearchIndexBuilder;
import hudson.security.ACL;
import hudson.security.AccessControlled;
@@ -74,7 +75,6 @@ import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.Charset;
import java.text.DateFormat;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -108,6 +108,7 @@ import jenkins.model.PeepholePermalink;
import jenkins.model.RunAction2;
import jenkins.model.StandardArtifactManager;
import jenkins.model.lazy.BuildReference;
+import jenkins.model.lazy.LazyBuildMixIn;
import jenkins.util.VirtualFile;
import jenkins.util.io.OnMaster;
import net.sf.json.JSONObject;
@@ -146,7 +147,7 @@ public abstract class Run ,RunT extends Run,RunT extends Run,RunT extends Run ID_FORMATTER = new IDFormatterProvider();
- private static final class IDFormatterProvider extends ThreadLocal {
- @Override
- protected SimpleDateFormat initialValue() {
- synchronized (CANONICAL_ID_FORMATTER) {
- return (SimpleDateFormat) CANONICAL_ID_FORMATTER.clone();
- }
- }
- };
-
/**
* Creates a new {@link Run}.
* @param job Owner job
*/
protected Run(@Nonnull JobT job) throws IOException {
- this(job, new GregorianCalendar());
+ this(job, System.currentTimeMillis());
this.number = project.assignBuildNumber();
LOGGER.log(FINER, "new {0} @{1}", new Object[] {this, hashCode()});
}
@@ -290,24 +283,29 @@ public abstract class Run ,RunT extends RunMay be used in a {@link SubTask#createExecutable} (instead of calling {@link LazyBuildMixIn#newBuild}).
+ * For example, {@code MatrixConfiguration.newBuild} does this
+ * so that the {@link #timestamp} as well as {@link #number} are shared with the parent build.
*/
protected Run(@Nonnull JobT job, @Nonnull Calendar timestamp) {
this(job,timestamp.getTimeInMillis());
}
+ /** @see #Run(Job, Calendar) */
protected Run(@Nonnull JobT job, long timestamp) {
this.project = job;
this.timestamp = timestamp;
this.state = State.NOT_STARTED;
- getRootDir().mkdirs();
}
/**
* Loads a run from a log file.
*/
protected Run(@Nonnull JobT project, @Nonnull File buildDir) throws IOException {
- this(project, parseTimestampFromBuildDir(buildDir));
+ this.project = project;
this.previousBuildInProgress = _this(); // loaded builds are always completed
+ number = Integer.parseInt(buildDir.getName());
reload();
}
@@ -390,33 +388,6 @@ public abstract class Run ,RunT extends Run,RunT extends Run,RunT extends Run,RunT extends Run,RunT extends Run,RunT extends Run> extends AbstractLazyLoadRunMap
private Constructor cons;
+ /** Normally overwritten by {@link LazyBuildMixIn#onLoad} or {@link LazyBuildMixIn#onCreatedFromScratch}, in turn created during {@link Job#onLoad}. */
+ @Restricted(NoExternalUse.class)
+ public RunIdMigrator runIdMigrator = new RunIdMigrator();
+
// TODO: before first complete build
// patch up next/previous build link
@@ -118,6 +123,7 @@ public final class RunMap> extends AbstractLazyLoadRunMap
@Override
public boolean removeValue(R run) {
run.dropLinks();
+ runIdMigrator.delete(dir, run.getId());
return super.removeValue(run);
}
@@ -169,11 +175,32 @@ public final class RunMap> extends AbstractLazyLoadRunMap
return r.getId();
}
+ /**
+ * Add a new build to the map.
+ * Do not use when loading existing builds (use {@link #put(Integer, Object)}).
+ */
@Override
public R put(R r) {
+ // Defense against JENKINS-23152 and its ilk.
+ File rootDir = r.getRootDir();
+ if (rootDir.isDirectory()) {
+ throw new IllegalStateException(rootDir + " already existed; will not overwite with " + r);
+ }
+ proposeNewNumber(r.getNumber());
+ rootDir.mkdirs();
return super._put(r);
}
+ @Override public R getById(String id) {
+ int n;
+ try {
+ n = Integer.parseInt(id);
+ } catch (NumberFormatException x) {
+ n = runIdMigrator.findNumber(id);
+ }
+ return getByNumber(n);
+ }
+
/**
* Reuses the same reference as much as we can.
*
@@ -185,31 +212,6 @@ public final class RunMap> extends AbstractLazyLoadRunMap
return r.createReference();
}
- @Override
- protected FilenameFilter createDirectoryFilter() {
- final SimpleDateFormat formatter = Run.ID_FORMATTER.get();
-
- return new FilenameFilter() {
- @Override public boolean accept(File dir, String name) {
- if (name.startsWith("0000")) {
- // JENKINS-1461 sometimes create bogus data directories with impossible dates, such as year 0, April 31st,
- // or August 0th. Date object doesn't roundtrip those, so we eventually fail to load this data.
- // Don't even bother trying.
- return false;
- }
- try {
- if (formatter.format(formatter.parse(name)).equals(name)) {
- return true;
- }
- } catch (ParseException e) {
- // fall through
- }
- LOGGER.log(FINE, "Skipping {0} in {1}", new Object[] {name, dir});
- return false;
- }
- };
- }
-
@Override
protected R retrieve(File d) throws IOException {
if(new File(d,"build.xml").exists()) {
@@ -221,17 +223,6 @@ public final class RunMap> extends AbstractLazyLoadRunMap
LOGGER.log(FINEST, "Loaded " + b.getFullDisplayName() + " in " + Thread.currentThread().getName(), new ThisIsHowItsLoaded());
}
return b;
- } catch (Run.InvalidDirectoryNameException x) {
- Level lvl;
- try {
- Integer.parseInt(d.getName());
- // JENKINS-15587: just an mangled symlink
- lvl = Level.FINE;
- } catch (NumberFormatException x2) {
- // potentially a real build dir, maybe a bug
- lvl = Level.WARNING;
- }
- LOGGER.log(lvl, "skipping non-build directory {0}", d);
} catch (IOException e) {
LOGGER.log(Level.WARNING, "could not load " + d, e);
} catch (InstantiationError e) {
diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
index ec8a2aab9c157025afd609b5a93acf38a7bfaca7..f4d5a165b96ec4ad244445e3f53f78e7c3c0db78 100644
--- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
+++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -69,6 +69,7 @@ public abstract class TopLevelItemDescriptor extends Descriptor {
* {@link TopLevelItemDescriptor}s that act like a wizard and produces different
* object types than {@link #clazz} can override this method to augment
* instance-descriptor relationship.
+ * @since 1.410
*/
public boolean testInstance(TopLevelItem i) {
return clazz.isInstance(i);
diff --git a/core/src/main/java/hudson/model/queue/FutureImpl.java b/core/src/main/java/hudson/model/queue/FutureImpl.java
index da63f9c11d20a13c71ca5d24f0f47513761c658c..2104dd4fcfff59b93b0f95c425f28e61776824be 100644
--- a/core/src/main/java/hudson/model/queue/FutureImpl.java
+++ b/core/src/main/java/hudson/model/queue/FutureImpl.java
@@ -84,6 +84,14 @@ public final class FutureImpl extends AsyncFutureImpl implements Que
}
}
+ @Override
+ public synchronized void setAsCancelled() {
+ super.setAsCancelled();
+ if (!start.isDone()) {
+ start.setAsCancelled();
+ }
+ }
+
synchronized void addExecutor(@Nonnull Executor executor) {
this.executors.add(executor);
}
diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
index 37e4b385f19d8a59fe4930704fb781639d9a9a0f..4bd1c939c622c890ae81d59977b82225e2db6f9d 100644
--- a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
@@ -51,7 +51,7 @@ public abstract class DiskSpaceMonitorDescriptor extends AbstractAsyncNodeMonito
* Value object that represents the disk space.
*/
@ExportedBean
- public static final class DiskSpace extends OfflineCause implements Serializable {
+ public static final class DiskSpace extends MonitorOfflineCause implements Serializable {
private final String path;
@Exported
public final long size;
@@ -70,7 +70,7 @@ public abstract class DiskSpaceMonitorDescriptor extends AbstractAsyncNodeMonito
@Override
public String toString() {
- return String.valueOf(size);
+ return Messages.DiskSpaceMonitorDescriptor_DiskSpace_FreeSpaceTooLow(getGbLeft(), path);
}
/**
@@ -119,6 +119,7 @@ public abstract class DiskSpaceMonitorDescriptor extends AbstractAsyncNodeMonito
this.triggered = triggered;
}
+ @Override
public Class getTrigger() {
return trigger;
}
diff --git a/core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java b/core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
new file mode 100644
index 0000000000000000000000000000000000000000..4b7c5b60085fbed2721c39bc9290a08d99baba84
--- /dev/null
+++ b/core/src/main/java/hudson/node_monitors/MonitorOfflineCause.java
@@ -0,0 +1,42 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2014 Red Hat, 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.node_monitors;
+
+import javax.annotation.Nonnull;
+
+import hudson.slaves.OfflineCause;
+
+/**
+ * Offline cause to denote it was node monitor what put computer offline.
+ *
+ * @author ogondza
+ * @since 1.595
+ */
+public abstract class MonitorOfflineCause extends OfflineCause {
+
+ /**
+ * Identify monitor implementation that put computer offline.
+ */
+ public abstract @Nonnull Class getTrigger();
+}
diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
index fa864bae3c0f155c5e7c5423e53ff3fc297c6901..69da2e6bcddc404dbdd75d506c91eed55c3e2576 100644
--- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
@@ -142,7 +142,7 @@ public class ResponseTimeMonitor extends NodeMonitor {
* Immutable representation of the monitoring data.
*/
@ExportedBean
- public static final class Data extends OfflineCause implements Serializable {
+ public static final class Data extends MonitorOfflineCause implements Serializable {
/**
* Record of the past 5 times. -1 if time out. Otherwise in milliseconds.
* Old ones first.
@@ -204,6 +204,11 @@ public class ResponseTimeMonitor extends NodeMonitor {
return getAverage()+"ms";
}
+ @Override
+ public Class getTrigger() {
+ return ResponseTimeMonitor.class;
+ }
+
private static final long serialVersionUID = 1L;
}
diff --git a/core/src/main/java/hudson/scheduler/BaseParser.java b/core/src/main/java/hudson/scheduler/BaseParser.java
index 1e32f0d0425c7287dc525e3bcffe2ca8ccb1242b..476bc41e5e3a98e417e497f5e0e9239658c83a40 100644
--- a/core/src/main/java/hudson/scheduler/BaseParser.java
+++ b/core/src/main/java/hudson/scheduler/BaseParser.java
@@ -96,10 +96,12 @@ abstract class BaseParser extends LLkParser {
int u = UPPER_BOUNDS[field];
if (field==2) u = 28; // day of month can vary depending on month, so to make life simpler, just use [1,28] that's always safe
if (field==4) u = 6; // Both 0 and 7 of day of week are Sunday. For better distribution, limit upper bound to 6
- return doHash(LOWER_BOUNDS[field], u, step);
+ return doHash(LOWER_BOUNDS[field], u, step, field);
}
- protected long doHash(int s, int e, int step) throws ANTLRException {
+ protected long doHash(int s, int e, int step, int field) throws ANTLRException {
+ rangeCheck(s, field);
+ rangeCheck(e, field);
if (step > e - s + 1) {
error(Messages.BaseParser_OutOfRange(step, 1, e - s + 1));
throw new AssertionError();
diff --git a/core/src/main/java/hudson/security/Permission.java b/core/src/main/java/hudson/security/Permission.java
index 20c43b09803c885f01c7b82e28e1b55810d9e989..7c758072da9f433e291a7c9003d41e78ed8935ca 100644
--- a/core/src/main/java/hudson/security/Permission.java
+++ b/core/src/main/java/hudson/security/Permission.java
@@ -144,10 +144,11 @@ public final class Permission {
* See {@link #description}.
* @param impliedBy
* See {@link #impliedBy}.
+ * @throws IllegalStateException if this permission was already defined
*/
public Permission(@Nonnull PermissionGroup group, @Nonnull String name,
@CheckForNull Localizable description, @CheckForNull Permission impliedBy, boolean enable,
- @Nonnull PermissionScope[] scopes) {
+ @Nonnull PermissionScope[] scopes) throws IllegalStateException {
if(!JSONUtils.isJavaIdentifier(name))
throw new IllegalArgumentException(name+" is not a Java identifier");
this.owner = group.owner;
@@ -221,6 +222,14 @@ public final class Permission {
return owner.getName()+'.'+name;
}
+ @Override public boolean equals(Object o) {
+ return o instanceof Permission && getId().equals(((Permission) o).getId());
+ }
+
+ @Override public int hashCode() {
+ return getId().hashCode();
+ }
+
/**
* Convert the ID representation into {@link Permission} object.
*
diff --git a/core/src/main/java/hudson/security/PermissionGroup.java b/core/src/main/java/hudson/security/PermissionGroup.java
index dc7bdaad25a95cdef98fc10b7699e6104daccd19..724e3594629dd8875f7370ddcd1c392f193d0cbe 100644
--- a/core/src/main/java/hudson/security/PermissionGroup.java
+++ b/core/src/main/java/hudson/security/PermissionGroup.java
@@ -23,17 +23,13 @@
*/
package hudson.security;
-import hudson.CopyOnWrite;
import hudson.model.Hudson;
-
-import java.util.List;
-import java.util.Collections;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ConcurrentHashMap;
-
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import javax.annotation.CheckForNull;
import org.jvnet.localizer.Localizable;
/**
@@ -42,8 +38,7 @@ import org.jvnet.localizer.Localizable;
* Sortable by the owner class name.
*/
public final class PermissionGroup implements Iterable, Comparable {
- private final List permisisons = new CopyOnWriteArrayList();
- private final List permisisonsView = Collections.unmodifiableList(permisisons);
+ private final SortedSet permissions = new TreeSet(Permission.ID_COMPARATOR);
public final Class owner;
/**
@@ -52,37 +47,41 @@ public final class PermissionGroup implements Iterable, Comparable
allGroups = new ArrayList(ALL);
- allGroups.add(this);
- Collections.sort(allGroups);
- ALL = Collections.unmodifiableList(allGroups);
- }
-
- PERMISSIONS.put(owner,this);
+ private String id() {
+ return owner.getName();
}
public Iterator iterator() {
- return permisisons.iterator();
+ return getPermissions().iterator();
}
- /*package*/ void add(Permission p) {
- permisisons.add(p);
+ /*package*/ synchronized void add(Permission p) {
+ if (!permissions.add(p)) {
+ throw new IllegalStateException("attempt to register a second Permission for " + p.getId());
+ }
}
/**
* Lists up all the permissions in this group.
*/
- public List getPermissions() {
- return permisisonsView;
+ public synchronized List getPermissions() {
+ return new ArrayList(permissions);
}
- public boolean hasPermissionContainedBy(PermissionScope scope) {
- for (Permission p : permisisons)
+ public synchronized boolean hasPermissionContainedBy(PermissionScope scope) {
+ for (Permission p : permissions)
if (p.isContainedBy(scope))
return true;
return false;
@@ -91,8 +90,8 @@ public final class PermissionGroup implements Iterable, Comparable
, Comparable
, Comparable
ALL = Collections.emptyList();
+ @Override public int hashCode() {
+ return id().hashCode();
+ }
+
+ public synchronized int size() {
+ return permissions.size();
+ }
+
+ @Override public String toString() {
+ return "PermissionGroup[" + id() + "]";
+ }
+
+ private static synchronized void register(PermissionGroup g) {
+ if (!PERMISSIONS.add(g)) {
+ throw new IllegalStateException("attempt to register a second PermissionGroup for " + g.id());
+ }
+ }
/**
* Returns all the {@link PermissionGroup}s available in the system.
* @return
* always non-null. Read-only.
*/
- public static List getAll() {
- return ALL;
+ public static synchronized List getAll() {
+ return new ArrayList(PERMISSIONS);
}
/**
@@ -139,12 +150,17 @@ public final class PermissionGroup implements Iterable, Comparable
PERMISSIONS = new ConcurrentHashMap();
+ private static final SortedSet PERMISSIONS = new TreeSet();
}
diff --git a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
index 1697c4645a281bc46f83d655248fc2409d9c0d67..6ff8da82274aaf441221e2ded8f6cb9046a45987 100644
--- a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
+++ b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
@@ -96,7 +96,7 @@ public class TokenBasedRememberMeServices2 extends TokenBasedRememberMeServices
logger.debug("Did not send remember-me cookie because 'Remember Me' is disabled in " +
"security configuration (principal did set parameter '" + getParameter() + "')");
}
- // XXX log warning when receiving remember-me request despite the feature being disabled?
+ // TODO log warning when receiving remember-me request despite the feature being disabled?
return;
}
diff --git a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
index 4c9ac2b5d162c8dc98a10d526c6b13dc8a71cc8d..b676a62f0bd3eea1fc8ecb8c70b622c87e95cfc4 100644
--- a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
+++ b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
@@ -63,7 +63,7 @@ public class ComputerRetentionWork extends PeriodicWork {
if (!nextCheck.containsKey(c) || startRun > nextCheck.get(c)) {
// at the moment I don't trust strategies to wait more than 60 minutes
// strategies need to wait at least one minute
- final long waitInMins = Math.min(1, Math.max(60, c.getRetentionStrategy().check(c)));
+ final long waitInMins = Math.max(1, Math.min(60, c.getRetentionStrategy().check(c)));
nextCheck.put(c, startRun + waitInMins*1000*60 /*MINS->MILLIS*/);
}
}
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index ef14b0d6edc5d7930edf854160a7274877e84103..051809dfca8a14db6825b8abc00ec339a5524368 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -294,8 +294,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
public FingerprintAction(Run build, Map record) {
this.build = build;
- this.record = PackedMap.of(record);
- compact();
+ this.record = compact(record);
}
@Deprecated
@@ -306,9 +305,8 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
public void add(Map moreRecords) {
Map r = new HashMap(record);
r.putAll(moreRecords);
- record = PackedMap.of(r);
+ record = compact(r);
ref = null;
- compact();
}
public String getIconFileName() {
@@ -341,48 +339,20 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
@Override public void onLoad(Run r) {
build = r;
- compact();
+ record = compact(record);
}
@Override public void onAttached(Run r) {
// for historical reasons this setup is done in the constructor instead
}
- private void compact() {
- // share data structure with nearby builds, but to keep lazy loading efficient,
- // don't go back the history forever.
- if (rand.nextInt(2)!=0) {
- Run pb = build.getPreviousBuild();
- if (pb!=null) {
- FingerprintAction a = pb.getAction(FingerprintAction.class);
- if (a!=null)
- compact(a);
- }
- }
- }
-
- /**
- * Reuse string instances from another {@link FingerprintAction} to reduce memory footprint.
- */
- protected void compact(FingerprintAction a) {
- Map intern = new HashMap(); // string intern map
- for (Entry e : a.record.entrySet()) {
- intern.put(e.getKey(),e.getKey());
- intern.put(e.getValue(),e.getValue());
- }
-
- Map b = new HashMap();
+ /** Share data structure with other builds, mainly those of the same job. */
+ private PackedMap compact(Map record) {
+ Map b = new HashMap();
for (Entry e : record.entrySet()) {
- String k = intern.get(e.getKey());
- if (k==null) k = e.getKey();
-
- String v = intern.get(e.getValue());
- if (v==null) v = e.getValue();
-
- b.put(k,v);
+ b.put(e.getKey().intern(), e.getValue().intern());
}
-
- record = PackedMap.of(b);
+ return PackedMap.of(b);
}
/**
diff --git a/core/src/main/java/hudson/tools/AbstractCommandInstaller.java b/core/src/main/java/hudson/tools/AbstractCommandInstaller.java
index 18431fcda17ef3e2378ffd5d240e96fabbda0840..f104e185218ace5074b9dd642a44ca480fac652f 100644
--- a/core/src/main/java/hudson/tools/AbstractCommandInstaller.java
+++ b/core/src/main/java/hudson/tools/AbstractCommandInstaller.java
@@ -70,7 +70,7 @@ public abstract class AbstractCommandInstaller extends ToolInstaller {
@Override
public FilePath performInstallation(ToolInstallation tool, Node node, TaskListener log) throws IOException, InterruptedException {
FilePath dir = preferredLocation(tool, node);
- // XXX support Windows batch scripts, Unix scripts with interpreter line, etc. (see CommandInterpreter subclasses)
+ // TODO support Unix scripts with interpreter line (see Shell.buildCommandLine)
FilePath script = dir.createTextTempFile("hudson", getCommandFileExtension(), command);
try {
String cmd[] = getCommandCall(script);
diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
index 28d9947abe89be55ca9ffcf6d9dcb5881e73e0b8..2cddb4d69c3ffc48d13550c5229a99628e89eeb3 100644
--- a/core/src/main/java/hudson/tools/JDKInstaller.java
+++ b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -234,13 +234,15 @@ public class JDKInstaller extends ToolInstaller {
- http://java.sun.com/j2se/1.5.0/sdksilent.html
- http://java.sun.com/j2se/1.4.2/docs/guide/plugin/developer_guide/silent.html
*/
- String logFile = jdkBundle+".install.log";
expectedLocation = expectedLocation.trim();
if (expectedLocation.endsWith("\\")) {
// Prevent a trailing slash from escaping quotes
expectedLocation = expectedLocation.substring(0, expectedLocation.length() - 1);
}
+ String logFile = new FilePath(launcher.getChannel(), expectedLocation).getParent().createTempFile("install", "log").getRemote();
+
+
ArgumentListBuilder args = new ArgumentListBuilder();
assert (new File(expectedLocation).exists()) : expectedLocation
+ " must exist, otherwise /L will cause the installer to fail with error 1622";
@@ -248,20 +250,19 @@ public class JDKInstaller extends ToolInstaller {
// Installer uses InstallShield.
args.add("CMD.EXE", "/C");
+ // see http://docs.oracle.com/javase/1.5.0/docs/guide/deployment/deployment-guide/silent.html
// CMD.EXE /C must be followed by a single parameter (do not split it!)
args.add(jdkBundle + " /s /v\"/qn REBOOT=ReallySuppress INSTALLDIR=\\\""
- + expectedLocation + "\\\" /L \\\"" + expectedLocation
- + "\\jdk.exe.install.log\\\"\"");
+ + expectedLocation + "\\\" /L \\\"" + logFile + "\\\"\"");
} else {
// Installed uses Windows Installer (MSI)
args.add(jdkBundle, "/s");
// Create a private JRE by omitting "PublicjreFeature"
// @see http://docs.oracle.com/javase/7/docs/webnotes/install/windows/jdk-installation-windows.html#jdk-silent-installation
- args.add("ADDLOCAL=\"ToolsFeature\"");
-
- args.add("REBOOT=ReallySuppress", "INSTALLDIR=" + expectedLocation,
- "/L \\\"" + expectedLocation + "\\jdk.exe.install.log\\\"");
+ args.add("ADDLOCAL=\"ToolsFeature\"",
+ "REBOOT=ReallySuppress", "INSTALLDIR=" + expectedLocation,
+ "/L", logFile);
}
int r = launcher.launch().cmds(args).stdout(out)
.pwd(new FilePath(launcher.getChannel(), expectedLocation)).join();
@@ -716,7 +717,7 @@ public class JDKInstaller extends ToolInstaller {
if (value) {
return FormValidation.ok();
} else {
- return FormValidation.error(Messages.JDKInstaller_DescriptorImpl_doCheckAcceptLicense());
+ return FormValidation.error(Messages.JDKInstaller_DescriptorImpl_doCheckAcceptLicense());
}
}
diff --git a/core/src/main/java/hudson/triggers/SafeTimerTask.java b/core/src/main/java/hudson/triggers/SafeTimerTask.java
index 49524fbec0b66bbabb07715c033cdd6137cb792c..e47dfc61e62b52872beaede1f3a03317cf5f5bfe 100644
--- a/core/src/main/java/hudson/triggers/SafeTimerTask.java
+++ b/core/src/main/java/hudson/triggers/SafeTimerTask.java
@@ -23,27 +23,24 @@
*/
package hudson.triggers;
-import org.acegisecurity.context.SecurityContext;
-import org.acegisecurity.context.SecurityContextHolder;
-
-import java.util.Timer;
+import hudson.model.AperiodicWork;
+import hudson.model.PeriodicWork;
+import hudson.security.ACL;
import java.util.TimerTask;
-import java.util.logging.Logger;
import java.util.logging.Level;
-
-import hudson.security.ACL;
+import java.util.logging.Logger;
+import jenkins.util.Timer;
+import org.acegisecurity.context.SecurityContext;
+import org.acegisecurity.context.SecurityContextHolder;
/**
- * {@link Timer} wrapper so that a fatal error in {@link TimerTask}
- * won't terminate the timer.
+ * Wrapper so that a fatal error in {@link TimerTask} will not terminate the timer.
*
*
- * {@link Trigger#timer} is a shared timer instance that can be used inside Hudson to
- * schedule a recurring work.
- *
+ * {@link Timer#get} is a shared timer instance that can be used inside Jenkins to schedule recurring work.
+ * But the usual usage is automatic via {@link PeriodicWork} or {@link AperiodicWork}.
* @author Kohsuke Kawaguchi
* @since 1.124
- * @see Trigger#timer
*/
public abstract class SafeTimerTask extends TimerTask {
public final void run() {
diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java
index 36c7fdf7d6fc006015925f1f282b99b8a9f1762d..32b4d9b5bc36689cd365f13908925b481d1e67b6 100644
--- a/core/src/main/java/hudson/triggers/Trigger.java
+++ b/core/src/main/java/hudson/triggers/Trigger.java
@@ -214,8 +214,7 @@ public abstract class Trigger implements Describable>
checkTriggers(cal);
} catch (Throwable e) {
LOGGER.log(Level.WARNING,"Cron thread throw an exception",e);
- // bug in the code. Don't let the thread die.
- e.printStackTrace();
+ // SafeTimerTask.run would also catch this, but be sure to increment cal too.
}
cal.add(Calendar.MINUTE,1);
diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java
index 28d505a1b5477598af3e34d5fa91efb4b3f2fd18..dfc8bdf03e38f670f9bbeec4273627959ea531a5 100644
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
@@ -1,18 +1,18 @@
/*
* The MIT License
- *
+ *
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts
- *
+ *
* 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
@@ -25,17 +25,22 @@ package hudson.util;
import hudson.ExtensionPoint;
import hudson.security.SecurityRealm;
+import jenkins.model.Jenkins;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.util.Iterator;
import java.util.List;
import java.util.Vector;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* Servlet {@link Filter} that chains multiple {@link Filter}s, provided by plugins
@@ -51,61 +56,82 @@ import java.util.Vector;
* @see SecurityRealm
*/
public class PluginServletFilter implements Filter, ExtensionPoint {
+ private final List list = new CopyOnWriteArrayList();
+
+ private /*almost final*/ FilterConfig config;
- private static final List LIST = new Vector();
-
- private static FilterConfig filterConfig;
-
- public PluginServletFilter() {
+ /**
+ * For backward compatibility with plugins that might register filters before Jenkins.getInstance()
+ * starts functioning, when we are not sure which Jenkins instance a filter belongs to, put it here,
+ * and let the first Jenkins instance take over.
+ */
+ private static final List LEGACY = new Vector();
+
+ private static final String KEY = PluginServletFilter.class.getName();
+
+ /**
+ * Lookup the instance from servlet context.
+ */
+ private static PluginServletFilter getInstance(ServletContext c) {
+ return (PluginServletFilter)c.getAttribute(KEY);
}
- @edu.umd.cs.findbugs.annotations.SuppressWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
- public void init(FilterConfig filterConfig) throws ServletException {
- PluginServletFilter.filterConfig = filterConfig;
- synchronized (LIST) {
- for (Filter f : LIST) {
- f.init(filterConfig);
- }
- }
+ public void init(FilterConfig config) throws ServletException {
+ this.config = config;
+ synchronized (LEGACY) {
+ list.addAll(LEGACY);
+ LEGACY.clear();
+ }
+ for (Filter f : list) {
+ f.init(config);
+ }
+ config.getServletContext().setAttribute(KEY,this);
}
-
+
public static void addFilter(Filter filter) throws ServletException {
- synchronized (LIST) {
- if (filterConfig != null) {
- filter.init(filterConfig);
- }
- LIST.add(filter);
- }
+ Jenkins j = Jenkins.getInstance();
+ if (j==null) {
+ // report who is doing legacy registration
+ LOGGER.log(Level.WARNING, "Filter instance is registered too early: "+filter, new Exception());
+ LEGACY.add(filter);
+ } else {
+ PluginServletFilter container = getInstance(j.servletContext);
+ filter.init(container.config);
+ container.list.add(filter);
+ }
}
public static void removeFilter(Filter filter) throws ServletException {
- synchronized (LIST) {
- LIST.remove(filter);
- }
+ Jenkins j = Jenkins.getInstance();
+ if (j==null) {
+ LEGACY.remove(filter);
+ } else {
+ getInstance(j.servletContext).list.remove(filter);
+ }
}
public void doFilter(ServletRequest request, ServletResponse response, final FilterChain chain) throws IOException, ServletException {
new FilterChain() {
- private int position=0;
- // capture the array for thread-safety
- private final Filter[] filters = LIST.toArray(new Filter[LIST.size()]);
+ private final Iterator itr = list.iterator();
public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
- if(position==filters.length) {
+ if(itr.hasNext()) {
+ // call next
+ itr.next().doFilter(request, response, this);
+ } else {
// reached to the end
chain.doFilter(request,response);
- } else {
- // call next
- filters[position++].doFilter(request,response,this);
}
}
}.doFilter(request,response);
}
public void destroy() {
- synchronized (LIST) {
- for (Filter f : LIST)
- f.destroy();
+ for (Filter f : list) {
+ f.destroy();
}
+ list.clear();
}
+
+ private static final Logger LOGGER = Logger.getLogger(PluginServletFilter.class.getName());
}
diff --git a/core/src/main/java/jenkins/diagnostics/ooom/BuildPtr.java b/core/src/main/java/jenkins/diagnostics/ooom/BuildPtr.java
deleted file mode 100644
index 8d269ea634a551f64247c6938d838e2e60b22d05..0000000000000000000000000000000000000000
--- a/core/src/main/java/jenkins/diagnostics/ooom/BuildPtr.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package jenkins.diagnostics.ooom;
-
-import hudson.FilePath;
-import hudson.model.Job;
-import hudson.model.TaskListener;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * ID and build number of one build.
- */
-public final class BuildPtr implements Comparable {
- final Job job;
-
- final File buildDir;
- /**
- * Timestamp build ID.
- */
- public final String id;
- /**
- * Build number found from the disk.
- */
- public final int n;
-
- /**
- * Position of this build according to the ordering induced by {@link #n}
- */
- int posByN;
-
- /**
- * Position of this build according to the ordering induced by {@link #id}
- */
- int posByID;
-
-
- BuildPtr(Job job, File buildDir, int n) {
- this.job = job;
- this.n = n;
- this.id = buildDir.getName();
- this.buildDir = buildDir;
- }
-
- @Override
- public String toString() {
- return buildDir.toString()+":#"+n;
- }
-
-
- /**
- * If this build and that build are inconsistent, in that
- * their numbers and timestamps are ordering in the wrong direction.
- */
- public boolean isInconsistentWith(BuildPtr that) {
- return signOfCompare(this.posByN,that.posByN) * signOfCompare(this.posByID,that.posByID) < 0;
- }
-
- /**
- * sign of (a-b).
- */
- private static int signOfCompare(int a, int b) {
- if (a>b) return 1;
- if (a "+dst);
- if (!buildDir.renameTo(dst)) {
- FilePath bd = new FilePath(buildDir);
- bd.copyRecursiveTo(new FilePath(dst));
- bd.deleteRecursive();
- }
-
- // if there's a symlink delete it
- new File(buildDir.getParentFile(),String.valueOf(n)).delete();
- }
-
- @Override
- public int compareTo(BuildPtr that) {
- return this.id.compareTo(that.id);
- }
-}
diff --git a/core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildDetector.java b/core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildDetector.java
deleted file mode 100644
index a42736146fae372125f1631da2b34f6668622be8..0000000000000000000000000000000000000000
--- a/core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildDetector.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package jenkins.diagnostics.ooom;
-
-import hudson.Extension;
-import hudson.model.AsyncPeriodicWork;
-import hudson.model.Job;
-import hudson.model.TaskListener;
-import hudson.util.TimeUnit2;
-import jenkins.model.Jenkins;
-
-import javax.inject.Inject;
-import java.io.IOException;
-
-/**
- * Discovers {@link Problem}s periodically in the background and
- * pass them on to {@link OutOfOrderBuildMonitor}.
- *
- * @author Kohsuke Kawaguchi
- */
-@Extension
-public class OutOfOrderBuildDetector extends AsyncPeriodicWork {
- @Inject
- private OutOfOrderBuildMonitor monitor;
-
-
- public OutOfOrderBuildDetector() {
- super("Out of order build detection");
- }
-
- @Override
- protected void execute(TaskListener listener) throws IOException, InterruptedException {
- execute(listener, 10*1000);
- }
-
- /**
- * Performs the check synchronously.
- *
- * @param delay
- * delay in the number of milli-seconds to reduce the load on I/O.
- */
- public void execute(TaskListener listener, int delay) throws InterruptedException {
- for (Job j : Jenkins.getInstance().getAllItems(Job.class)) {
- listener.getLogger().println("Scanning " + j.getFullName());
-
- Problem p = Problem.find(j);
- if (p!=null) {
- monitor.addProblem(p);
- listener.getLogger().println(" found problems: "+p);
- }
-
- Thread.sleep(delay);
- }
- }
-
- @Override
- public long getRecurrencePeriod() {
- return TimeUnit2.DAYS.toMillis(1);
- }
-}
diff --git a/core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor.java b/core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor.java
deleted file mode 100644
index abf500f190f4ab7e73c938f7880b33eb27c0590f..0000000000000000000000000000000000000000
--- a/core/src/main/java/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package jenkins.diagnostics.ooom;
-
-import hudson.Extension;
-import hudson.model.TaskListener;
-import hudson.util.HttpResponses;
-import jenkins.management.AsynchronousAdministrativeMonitor;
-import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.interceptor.RequirePOST;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * Reports any {@link Problem}s found and report them in the "Manage Jenkins" page.
- *
- * @author Kohsuke Kawaguchi
- */
-@Extension
-public class OutOfOrderBuildMonitor extends AsynchronousAdministrativeMonitor {
- private final Set problems = Collections.synchronizedSet(new LinkedHashSet());
-
- @Override
- public boolean isActivated() {
- return !problems.isEmpty() || getLogFile().exists();
- }
-
- void addProblem(Problem p) {
- problems.add(p);
- }
-
- public Set getProblems() {
- return Collections.unmodifiableSet(new LinkedHashSet(problems));
- }
-
- @RequirePOST
- public HttpResponse doFix() {
- start(false);
- return HttpResponses.forwardToPreviousPage();
- }
-
- /**
- * Discards the current log file so that the "stuff is completed" message will be gone.
- */
- @RequirePOST
- public HttpResponse doDismiss() {
- getLogFile().delete();
- return HttpResponses.forwardToPreviousPage();
- }
-
- @Override
- public String getDisplayName() {
- return "Fix Out-of-order Builds";
- }
-
- @Override
- public File getLogFile() {
- return super.getLogFile();
- }
-
- @Override
- protected void fix(TaskListener listener) throws Exception {
- Set problems = getProblems();
- for (Problem problem : problems) {
- problem.fix(listener);
- }
- this.problems.removeAll(problems);
- }
-}
diff --git a/core/src/main/java/jenkins/diagnostics/ooom/Problem.java b/core/src/main/java/jenkins/diagnostics/ooom/Problem.java
deleted file mode 100644
index 662328dff51d1e74cec2573e80b57f9347aff650..0000000000000000000000000000000000000000
--- a/core/src/main/java/jenkins/diagnostics/ooom/Problem.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package jenkins.diagnostics.ooom;
-
-import hudson.AbortException;
-import hudson.Util;
-import hudson.model.AbstractProject;
-import hudson.model.Job;
-import hudson.model.Run;
-import hudson.model.TaskListener;
-import jenkins.model.lazy.AbstractLazyLoadRunMap;
-import org.xml.sax.InputSource;
-
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.logging.Logger;
-
-import static java.util.logging.Level.*;
-
-/**
- * Look at build numbers in build.xml and compare them with build IDs (timestamps).
- *
- * When they are inconsistent (newer build timestamp-wise has an older build number),
- * it'll confuse the binary search in {@link AbstractLazyLoadRunMap}, so detect them and report them.
- *
- * @author Kohsuke Kawaguchi
- */
-public final class Problem {
- public final Job job;
-
- /**
- * A smallest set of builds whose removals would correct the order
- * inconsistency problem.
- */
- private final Set offenders = new TreeSet();
-
- /**
- * Scans the inconsistencies and return the information about it.
- *
- * @return null if no problems were found.
- */
- public static Problem find(Job j) {
- Problem p = new Problem(j);
- if (p.countInconsistencies()==0) return null;
- return p;
- }
-
- private Problem(Job j) {
- this.job = j;
- new Inspector().inspect();
- }
-
- public Set getOffenders() {
- return Collections.unmodifiableSet(offenders);
- }
-
- /**
- * Number of inconsistencies, which is the number of builds whose IDs
- * have to be messed around on disk to collect problems.
- */
- public int countInconsistencies() {
- return offenders.size();
- }
-
- /**
- * Equality is based on the job.
- */
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Problem problem = (Problem) o;
-
- return job.equals(problem.job);
- }
-
- @Override
- public int hashCode() {
- return job.hashCode();
- }
-
- @Override
- public String toString() {
- return job.getFullName() + " " + Util.join(offenders);
- }
-
- public void fix(TaskListener listener) throws IOException, InterruptedException {
- listener.getLogger().println("Fixing problems in " + job.getFullName());
- for (BuildPtr o : offenders) {
- o.fix(listener);
- }
-
- if (job instanceof AbstractProject) {
- // let all the current references go and build a new one
- AbstractProject a = (AbstractProject) job;
- a._getRuns().purgeCache();
- }
- }
-
- /**
- * Finds the problems and builds up the data model of {@link Problem}.
- */
- class Inspector {
- /**
- * All the builds sorted by their {@link BuildPtr#n}
- */
- private List byN;
- /**
- * All the builds sorted by their {@link BuildPtr#id}
- */
- private List byId;
-
- private final XPathExpression xpath;
-
- Inspector() {
- try {
- xpath = XPathFactory.newInstance().newXPath().compile("/*/number/text()");
- } catch (XPathExpressionException e) {
- throw new AssertionError(e);
- }
- }
-
- /**
- * Simply report inconsistencies in the ordering.
- */
- protected void inspect() {
- Map builds = scan();
-
- byN = new ArrayList(builds.values());
- // this is already sorted by BuildPtr.n
- int i=0;
- for (BuildPtr b : byN) {
- b.posByN = i++;
- }
-
- byId = new ArrayList(byN);
- Collections.sort(byId);
- i=0;
- for (BuildPtr b : byId) {
- b.posByID = i++;
- }
-
- while (true) {
- BuildPtr b = pick();
- if (b==null)
- break;
- offenders.add(b);
- }
- }
-
- /**
- * Find the most inconsistent build, a build whose removal
- * would reduce the # of inconsistencies by the most.
- *
- * This process takes {@link #offenders} into account.
- *
- * @return null if there's no more build to remove.
- */
- private BuildPtr pick() {
- BuildPtr worst=null;
- int worstScore=0;
-
- for (BuildPtr b : byN) {
- if (offenders.contains(b))
- continue;
-
- int score = score(b);
- if (score>worstScore) {
- worst = b;
- worstScore = score;
- }
- }
-
- return worst;
- }
-
- /**
- * Count the number of other builds the given build is inconsistent with,
- * excluding inconsistencies with {@link #offenders} (since those inconsistencies
- * are already effectively resolved by fixing offenders.)
- */
- private int score(BuildPtr b) {
- int i=0;
- for (BuildPtr a : byN) {
- if (offenders.contains(a))
- continue;
- if (a.isInconsistentWith(b))
- i++;
- }
- return i;
- }
-
- /**
- * Looks at the builds directory of the given job and builds up the full map of build number to its ID.
- */
- protected SortedMap scan() {
- LOGGER.fine("Inspecting "+job);
-
- SortedMap builds = new TreeMap();
-
- File[] files = job.getBuildDir().listFiles();
- if (files==null) return builds;
-
- for (File build : files) {
- try {
- LOGGER.finer("Inspecting " + build);
-
- if (isInt(build.getName())) {
- // if this is a number, then it must be a build number
- String s = loadBuildNumberFromBuildXml(build);
- if (!s.equals(build.getName())) {
- LOGGER.warning(build+" contains build number "+s);
- // this index is invalid.
- if (build.delete()) {
- // index should be a symlink, and if so we can just delete it without losing data.
- LOGGER.info("Removed problematic index "+build);
- } else {
- // the deltion will fail if 'build' isn't just a symlink but an actual directory.
- // That is good, as we don't want to delete any real data.
- LOGGER.warning("Couldn't delete " + build);
- }
- }
- continue;
- }
-
-
- if (isID(build.getName())) {
- String bn = loadBuildNumberFromBuildXml(build);
- if (bn==null) {
- LOGGER.log(WARNING, "Failed to parse "+build);
- continue;
- }
-
- int n;
- try {
- n = Integer.parseInt(bn);
- } catch (NumberFormatException e) {
- LOGGER.log(WARNING, "Expected number in " + build + " but found " + bn, e);
- continue;
- }
-
- BuildPtr b = new BuildPtr(job,build,n);
-
- BuildPtr o = builds.put(n, b);
- if (o != null) {
- LOGGER.log(WARNING, "Multiple builds have the same number: {0} vs. {1}", new Object[] {o, b});
- offenders.add(b.compareTo(o) > 0 ? o : b);
- }
- }
- } catch (XPathExpressionException e) {
- LOGGER.log(WARNING, "Failed to inspect "+build, e);
- } catch (AbortException e) {
- LOGGER.log(WARNING, "Failed to inspect "+build+": "+e.getMessage());
- } catch (IOException e) {
- LOGGER.log(WARNING, "Failed to inspect "+build, e);
- }
- }
-
- return builds;
- }
-
- private boolean isInt(String s) {
- try {
- Integer.parseInt(s);
- return true;
- } catch (NumberFormatException e) {
- return false;
- }
- }
-
- private boolean isID(String s) {
- try {
- Run.ID_FORMATTER.get().parse(s);
- return true;
- } catch (ParseException e) {
- return false;
- }
- }
-
- private String loadBuildNumberFromBuildXml(File dir) throws XPathExpressionException, IOException {
- File buildXml = new File(dir, "build.xml");
- if (!buildXml.exists())
- throw new AbortException(buildXml+" doesn't exist");
- String systemId = buildXml.toURI().toURL().toExternalForm();
- return (String)xpath.evaluate(new InputSource(systemId), XPathConstants.STRING);
- }
- }
-
- private static final Logger LOGGER = Logger.getLogger(Problem.class.getName());
-}
diff --git a/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
index 616d3bd2fc6447fb684508741c4776bab0f71620..9289a23f1b559aefba66473f7e7e763fc0c6984e 100644
--- a/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
@@ -44,7 +44,7 @@ public class GlobalProjectNamingStrategyConfiguration extends GlobalConfiguratio
final JSONObject optJSONObject = json.optJSONObject("useProjectNamingStrategy");
if (optJSONObject != null) {
final JSONObject strategyObject = optJSONObject.getJSONObject("namingStrategy");
- final String className = strategyObject.getString("stapler-class");
+ final String className = strategyObject.getString("$class");
try {
Class clazz = Class.forName(className, true, Jenkins.getInstance().getPluginManager().uberClassLoader);
final ProjectNamingStrategy strategy = (ProjectNamingStrategy) req.bindJSON(clazz, strategyObject);
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 2828aaa6cd1b105610ed85f010ed87ec682500f4..7f7661410506299c77c2c3e89589b83511c172da 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2037,7 +2037,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
this.buildsDir = buildsDir;
}
- public FilePath getRootPath() {
+ @Override public @Nonnull FilePath getRootPath() {
return new FilePath(getRootDir());
}
@@ -3585,7 +3585,11 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
* Sign up for the user account.
*/
public void doSignup( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
- req.getView(getSecurityRealm(), "signup.jelly").forward(req, rsp);
+ if (getSecurityRealm().allowsSignup()) {
+ req.getView(getSecurityRealm(), "signup.jelly").forward(req, rsp);
+ return;
+ }
+ req.getView(SecurityRealm.class, "signup.jelly").forward(req, rsp);
}
/**
diff --git a/core/src/main/java/jenkins/model/RunIdMigrator.java b/core/src/main/java/jenkins/model/RunIdMigrator.java
new file mode 100644
index 0000000000000000000000000000000000000000..d03c85479b5ef0915c007df9bc04abd6e5f4d685
--- /dev/null
+++ b/core/src/main/java/jenkins/model/RunIdMigrator.java
@@ -0,0 +1,407 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Jesse Glick.
+ *
+ * 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 jenkins.model;
+
+import hudson.Extension;
+import hudson.Util;
+import hudson.model.Job;
+import hudson.model.RootAction;
+import hudson.model.Run;
+import hudson.util.AtomicFileWriter;
+import hudson.util.StreamTaskListener;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.time.FastDateFormat;
+import org.apache.tools.ant.BuildException;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.StaplerProxy;
+import org.kohsuke.stapler.framework.io.WriterOutputStream;
+
+import static java.util.logging.Level.*;
+
+/**
+ * Converts legacy {@code builds} directories to the current format.
+ *
+ * There would be one instance associated with each {@link Job}, to retain ID -> build# mapping.
+ *
+ * The {@link Job#getBuildDir} is passed to every method call (rather than being cached) in case it is moved.
+ */
+@Restricted(NoExternalUse.class)
+public final class RunIdMigrator {
+
+ private final DateFormat legacyIdFormatter = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
+
+ static final Logger LOGGER = Logger.getLogger(RunIdMigrator.class.getName());
+ private static final String MAP_FILE = "legacyIds";
+ /** avoids wasting a map for new jobs */
+ private static final Map EMPTY = new TreeMap();
+
+ /**
+ * Did we record "unmigrate" instruction for this $JENKINS_HOME? Yes if it's in the set.
+ */
+ private static final Set offeredToUnmigrate = Collections.synchronizedSet(new HashSet());
+
+ private @Nonnull Map idToNumber = EMPTY;
+
+ public RunIdMigrator() {}
+
+ /**
+ * @return whether there was a file to load
+ */
+ private boolean load(File dir) {
+ File f = new File(dir, MAP_FILE);
+ if (!f.isFile()) {
+ return false;
+ }
+ if (f.length() == 0) {
+ return true;
+ }
+ idToNumber = new TreeMap();
+ try {
+ for (String line : FileUtils.readLines(f)) {
+ int i = line.indexOf(' ');
+ idToNumber.put(line.substring(0, i), Integer.parseInt(line.substring(i + 1)));
+ }
+ } catch (Exception x) { // IOException, IndexOutOfBoundsException, NumberFormatException
+ LOGGER.log(WARNING, "could not read from " + f, x);
+ }
+ return true;
+ }
+
+ private void save(File dir) {
+ File f = new File(dir, MAP_FILE);
+ try {
+ AtomicFileWriter w = new AtomicFileWriter(f);
+ try {
+ for (Map.Entry entry : idToNumber.entrySet()) {
+ w.write(entry.getKey() + ' ' + entry.getValue() + '\n');
+ }
+ w.commit();
+ } finally {
+ w.abort();
+ }
+ } catch (IOException x) {
+ LOGGER.log(WARNING, "could not save changes to " + f, x);
+ }
+ }
+
+ /**
+ * Called when a job is first created.
+ * Just saves an empty marker indicating that this job needs no migration.
+ * @param dir as in {@link Job#getBuildDir}
+ */
+ public void created(File dir) {
+ save(dir);
+ }
+
+ /**
+ * Perform one-time migration if this has not been done already.
+ * Where previously there would be a {@code 2014-01-02_03-04-05/build.xml} specifying {@code 99} plus a symlink {@code 99 → 2014-01-02_03-04-05},
+ * after migration there will be just {@code 99/build.xml} specifying {@code 2014-01-02_03-04-05} and {@code …} according to local time zone at time of migration.
+ * Newly created builds are untouched.
+ * Does not throw {@link IOException} since we make a best effort to migrate but do not consider it fatal to job loading if we cannot.
+ * @param dir as in {@link Job#getBuildDir}
+ * @param jenkinsHome root directory of Jenkins (for logging only)
+ * @return true if migration was performed
+ */
+ public synchronized boolean migrate(File dir, @CheckForNull File jenkinsHome) {
+ if (load(dir)) {
+ LOGGER.log(FINER, "migration already performed for {0}", dir);
+ return false;
+ }
+ if (!dir.isDirectory()) {
+ LOGGER.log(/* normal during Job.movedTo */FINE, "{0} was unexpectedly missing", dir);
+ return false;
+ }
+ LOGGER.log(INFO, "Migrating build records in {0}", dir);
+ doMigrate(dir);
+ save(dir);
+ if (jenkinsHome != null && offeredToUnmigrate.add(jenkinsHome))
+ LOGGER.log(WARNING, "Build record migration (https://wiki.jenkins-ci.org/display/JENKINS/JENKINS-24380+Migration) is one-way. If you need to downgrade Jenkins, run: {0}", getUnmigrationCommandLine(jenkinsHome));
+ return true;
+ }
+
+ private static String getUnmigrationCommandLine(File jenkinsHome) {
+ StringBuilder cp = new StringBuilder();
+ for (Class c : new Class[] {RunIdMigrator.class, /* TODO how to calculate transitive dependencies automatically? */Charsets.class, WriterOutputStream.class, BuildException.class, FastDateFormat.class}) {
+ URL location = c.getProtectionDomain().getCodeSource().getLocation();
+ String locationS = location.toString();
+ if (location.getProtocol().equals("file")) {
+ try {
+ locationS = new File(location.toURI()).getAbsolutePath();
+ } catch (URISyntaxException x) {
+ // never mind
+ }
+ }
+ if (cp.length() > 0) {
+ cp.append(File.pathSeparator);
+ }
+ cp.append(locationS);
+ }
+ return String.format("java -classpath \"%s\" %s \"%s\"", cp, RunIdMigrator.class.getName(), jenkinsHome);
+ }
+
+ private static final Pattern NUMBER_ELT = Pattern.compile("(?m)^ (\\d+)(\r?\n)");
+ private void doMigrate(File dir) {
+ idToNumber = new TreeMap();
+ File[] kids = dir.listFiles();
+ // Need to process symlinks first so we can rename to them.
+ List kidsList = new ArrayList(Arrays.asList(kids));
+ Iterator it = kidsList.iterator();
+ while (it.hasNext()) {
+ File kid = it.next();
+ String name = kid.getName();
+ try {
+ String link = Util.resolveSymlink(kid);
+ if (link == null) {
+ continue;
+ }
+ try {
+ Integer.parseInt(name);
+ if (kid.delete()) {
+ LOGGER.log(FINE, "deleted build number symlink {0} → {1}", new Object[] {name, link});
+ } else {
+ LOGGER.log(WARNING, "could not delete build number symlink {0} → {1}", new Object[] {name, link});
+ }
+ } catch (NumberFormatException x) {
+ LOGGER.log(FINE, "skipping other symlink {0} → {1}", new Object[] {name, link});
+ }
+ it.remove();
+ } catch (Exception x) {
+ LOGGER.log(WARNING, "failed to process " + kid, x);
+ }
+ }
+ it = kidsList.iterator();
+ while (it.hasNext()) {
+ File kid = it.next();
+ try {
+ String name = kid.getName();
+ try {
+ Integer.parseInt(name);
+ LOGGER.log(FINE, "skipping new build dir {0}", name);
+ continue;
+ } catch (NumberFormatException x) {
+ // OK, next…
+ }
+ if (!kid.isDirectory()) {
+ LOGGER.log(FINE, "skipping non-directory {0}", name);
+ continue;
+ }
+ long timestamp;
+ try {
+ synchronized (legacyIdFormatter) {
+ timestamp = legacyIdFormatter.parse(name).getTime();
+ }
+ } catch (ParseException x) {
+ LOGGER.log(WARNING, "found unexpected dir {0}", name);
+ continue;
+ }
+ File buildXml = new File(kid, "build.xml");
+ if (!buildXml.isFile()) {
+ LOGGER.log(WARNING, "found no build.xml in {0}", name);
+ continue;
+ }
+ String xml = FileUtils.readFileToString(buildXml, Charsets.UTF_8);
+ Matcher m = NUMBER_ELT.matcher(xml);
+ if (!m.find()) {
+ LOGGER.log(WARNING, "could not find in {0}/build.xml", name);
+ continue;
+ }
+ int number = Integer.parseInt(m.group(1));
+ String nl = m.group(2);
+ xml = m.replaceFirst(" " + name + "" + nl + " " + timestamp + "" + nl);
+ File newKid = new File(dir, Integer.toString(number));
+ if (!kid.renameTo(newKid)) {
+ LOGGER.log(WARNING, "failed to rename {0} to {1}", new Object[] {name, number});
+ continue;
+ }
+ FileUtils.writeStringToFile(new File(newKid, "build.xml"), xml, Charsets.UTF_8);
+ LOGGER.log(FINE, "fully processed {0} → {1}", new Object[] {name, number});
+ idToNumber.put(name, number);
+ } catch (Exception x) {
+ LOGGER.log(WARNING, "failed to process " + kid, x);
+ }
+ }
+ }
+
+ /**
+ * Look up a historical run by ID.
+ * @param id a nonnumeric ID which may be a valid {@link Run#getId}
+ * @return the corresponding {@link Run#number}, or 0 if unknown
+ */
+ public synchronized int findNumber(@Nonnull String id) {
+ Integer number = idToNumber.get(id);
+ return number != null ? number : 0;
+ }
+
+ /**
+ * Delete the record of a build.
+ * @param dir as in {@link Job#getBuildDir}
+ * @param id a {@link Run#getId}
+ */
+ public synchronized void delete(File dir, String id) {
+ if (idToNumber.remove(id) != null) {
+ save(dir);
+ }
+ }
+
+ /**
+ * Reverses the migration, in case you want to revert to the older format.
+ * @param args one parameter, {@code $JENKINS_HOME}
+ */
+ public static void main(String... args) throws Exception {
+ if (args.length != 1) {
+ throw new Exception("pass one parameter, $JENKINS_HOME");
+ }
+ File root = new File(args[0]);
+ File jobs = new File(root, "jobs");
+ if (!jobs.isDirectory()) {
+ throw new FileNotFoundException("no such $JENKINS_HOME " + root);
+ }
+ new RunIdMigrator().unmigrateJobsDir(jobs);
+ }
+ private void unmigrateJobsDir(File jobs) throws Exception {
+ for (File job : jobs.listFiles()) {
+ File[] kids = job.listFiles();
+ if (kids == null) {
+ continue;
+ }
+ for (File kid : kids) {
+ if (!kid.isDirectory()) {
+ continue;
+ }
+ if (kid.getName().equals("builds")) {
+ unmigrateBuildsDir(kid);
+ } else {
+ // Might be jobs, modules, promotions, etc.; we assume an ItemGroup.getRootDirFor implementation returns grandchildren.
+ unmigrateJobsDir(kid);
+ }
+ }
+ }
+ }
+ private static final Pattern ID_ELT = Pattern.compile("(?m)^ ([0-9_-]+)(\r?\n)");
+ private static final Pattern TIMESTAMP_ELT = Pattern.compile("(?m)^ (\\d+)(\r?\n)");
+ /** Inverse of {@link #doMigrate}. */
+ private void unmigrateBuildsDir(File builds) throws Exception {
+ File mapFile = new File(builds, MAP_FILE);
+ if (!mapFile.isFile()) {
+ System.err.println(builds + " does not look to have been migrated yet; skipping");
+ return;
+ }
+ for (File build : builds.listFiles()) {
+ int number;
+ try {
+ number = Integer.parseInt(build.getName());
+ } catch (NumberFormatException x) {
+ continue;
+ }
+ File buildXml = new File(build, "build.xml");
+ if (!buildXml.isFile()) {
+ System.err.println(buildXml + " did not exist");
+ continue;
+ }
+ String xml = FileUtils.readFileToString(buildXml, Charsets.UTF_8);
+ Matcher m = TIMESTAMP_ELT.matcher(xml);
+ if (!m.find()) {
+ System.err.println(buildXml + " did not contain as expected");
+ continue;
+ }
+ long timestamp = Long.parseLong(m.group(1));
+ String nl = m.group(2);
+ xml = m.replaceFirst(" " + number + "" + nl);
+ m = ID_ELT.matcher(xml);
+ String id;
+ if (m.find()) {
+ id = m.group(1);
+ xml = m.replaceFirst("");
+ } else {
+ // Post-migration build. We give it a new ID based on its timestamp.
+ id = legacyIdFormatter.format(new Date(timestamp));
+ }
+ FileUtils.write(buildXml, xml, Charsets.UTF_8);
+ if (!build.renameTo(new File(builds, id))) {
+ System.err.println(build + " could not be renamed");
+ }
+ Util.createSymlink(builds, id, Integer.toString(number), StreamTaskListener.fromStderr());
+ }
+ Util.deleteFile(mapFile);
+ System.err.println(builds + " has been restored to its original format");
+ }
+
+ /**
+ * Expose unmigration instruction to the user.
+ */
+ @Extension
+ public static class UnmigrationInstruction implements RootAction, StaplerProxy {
+ @Override
+ public String getIconFileName() {
+ return null;
+ }
+
+ @Override
+ public String getDisplayName() {
+ return null;
+ }
+
+ @Override
+ public String getUrlName() {
+ return "JENKINS-24380";
+ }
+
+ @Override
+ public Object getTarget() {
+ Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
+ return this;
+ }
+
+ public String getCommand() {
+ return RunIdMigrator.getUnmigrationCommandLine(Jenkins.getInstance().getRootDir());
+ }
+ }
+}
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
index f299d598d07ca1c5db558849356ed33775a771e0..1fd3b58391a6874f913d503a951b79d062124140 100644
--- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
+++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -27,7 +27,6 @@ import hudson.model.Job;
import hudson.model.Run;
import hudson.model.RunMap;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.util.AbstractMap;
import java.util.ArrayList;
@@ -44,8 +43,6 @@ import java.util.logging.Logger;
import javax.annotation.CheckForNull;
import static jenkins.model.lazy.AbstractLazyLoadRunMap.Direction.*;
-import static jenkins.model.lazy.Boundary.*;
-import org.apache.commons.collections.keyvalue.DefaultMapEntry;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -60,26 +57,16 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
* requested, this class {@link #retrieve(File) retrieves them} on demand, one by one.
*
*
- * The lookup is primarily done by using the build number as the key (hence the key type is {@link Integer}),
- * but this class also provides look up based on {@linkplain #getIdOf(Object) the build ID}.
+ * The lookup is done by using the build number as the key (hence the key type is {@link Integer}).
*
*
* This class makes the following assumption about the on-disk layout of the data:
*
*
- *
Every build is stored in a directory, named after its ID.
- *
ID and build number are in the consistent order. That is,
- * if there are two builds #M and #N, {@code M>N <=> M.id > N.id}.
+ *
Every build is stored in a directory, named after its number.
*
*
*
- * On certain platforms, there are symbolic links named after build numbers that link to the build ID.
- * If these are available, they are used as a hint to speed up the lookup. Otherwise
- * we rely on the assumption above and perform a binary search to locate the build.
- * (notice that we'll have to do linear search if we don't have the consistent ordering assumption,
- * which robs the whole point of doing lazy loading.)
- *
- *
* Some of the {@link SortedMap} operations are weakly implemented. For example,
* {@link #size()} may be inaccurate because we only count the number of directories that look like
* build records, without checking if they are loadable. But these weaknesses aren't distinguishable
@@ -93,7 +80,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
*
* Object lock of {@code this} is used to make sure mutation occurs sequentially.
* That is, ensure that only one thread is actually calling {@link #retrieve(File)} and
- * updating {@link jenkins.model.lazy.AbstractLazyLoadRunMap.Index#byNumber} and {@link jenkins.model.lazy.AbstractLazyLoadRunMap.Index#byId}.
+ * updating {@link jenkins.model.lazy.AbstractLazyLoadRunMap.Index#byNumber}.
*
* @author Kohsuke Kawaguchi
* @since 1.485
@@ -112,8 +99,10 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
private LazyLoadRunMapEntrySet entrySet = new LazyLoadRunMapEntrySet(this);
/**
- * Pair of two maps into a single class, so that the changes can be made visible atomically,
- * and updates can happen concurrently to read.
+ * Historical holder for map.
+ *
+ * TODO all this mess including {@link #numberOnDisk} could probably be simplified to a single {@code TreeMap>}
+ * where a null value means not yet loaded and a broken entry just uses {@code NoHolder}.
*
* The idiom is that you put yourself in a synchronized block, {@linkplain #copy() make a copy of this},
* update the copy, then set it to {@link #index}.
@@ -121,63 +110,24 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
private class Index {
/**
* Stores the mapping from build number to build, for builds that are already loaded.
- */
- private final TreeMap> byNumber;
-
- /**
- * Stores the build ID to build number for builds that we already know.
*
* If we have known load failure of the given ID, we record that in the map
* by using the null value (not to be confused with a non-null {@link BuildReference}
* with null referent, which just means the record was GCed.)
*/
- private final TreeMap> byId;
+ private final TreeMap> byNumber;
private Index() {
- byId = new TreeMap>();
byNumber = new TreeMap>(COMPARATOR);
}
private Index(Index rhs) {
- byId = new TreeMap>(rhs.byId);
byNumber = new TreeMap>(rhs.byNumber);
}
-
- /**
- * Returns the build record #M (<=n)
- */
- private Map.Entry> ceilingEntry(int n) {
-// switch to this once we depend on JDK6
-// return byNumber.ceilingEntry(n);
-
- Set>> s = byNumber.tailMap(n).entrySet();
- if (s.isEmpty()) return null;
- else return s.iterator().next();
- }
-
- /**
- * Returns the build record #M (>=n)
- */
- // >= and not <= because byNumber is in the descending order
- private Map.Entry> floorEntry(int n) {
-// switch to this once we depend on JDK6
-// return byNumber.floorEntry(n);
-
- SortedMap> sub = byNumber.headMap(n);
- if (sub.isEmpty()) return null;
- Integer k = sub.lastKey();
- return new DefaultMapEntry(k,sub.get(k));
- }
}
/**
- * Build IDs found as directories, in the ascending order.
- */
- // copy on write
- private volatile SortedList idOnDisk = new SortedList(Collections.emptyList());
-
- /**
- * Build number shortcuts found on disk, in the ascending order.
+ * Build numbers found on disk, in the ascending order.
*/
// copy on write
private volatile SortedIntList numberOnDisk = new SortedIntList(0);
@@ -188,8 +138,9 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
* because the compatibility requires that we make it settable
* in the first call after the constructor.
*/
- private File dir;
+ protected File dir;
+ @Restricted(NoExternalUse.class) // subclassing other than by RunMap does not guarantee compatibility
protected AbstractLazyLoadRunMap(File dir) {
initBaseDir(dir);
}
@@ -199,7 +150,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
assert this.dir==null;
this.dir = dir;
if (dir!=null)
- loadIdOnDisk();
+ loadNumberOnDisk();
}
/**
@@ -230,31 +181,23 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
public synchronized void purgeCache() {
index = new Index();
fullyLoaded = false;
- loadIdOnDisk();
+ loadNumberOnDisk();
}
- private void loadIdOnDisk() {
+ private void loadNumberOnDisk() {
String[] kids = dir.list();
if (kids == null) {
// the job may have just been created
kids = EMPTY_STRING_ARRAY;
}
- List buildDirs = new ArrayList();
- FilenameFilter buildDirFilter = createDirectoryFilter();
SortedIntList list = new SortedIntList(kids.length / 2);
for (String s : kids) {
- if (buildDirFilter.accept(dir, s)) {
- buildDirs.add(s);
- } else {
- try {
- list.add(Integer.parseInt(s));
- } catch (NumberFormatException e) {
- // this isn't a shortcut
- }
+ try {
+ list.add(Integer.parseInt(s));
+ } catch (NumberFormatException e) {
+ // this isn't a build dir
}
}
- Collections.sort(buildDirs);
- idOnDisk = new SortedList(buildDirs);
list.sort();
numberOnDisk = list;
}
@@ -263,13 +206,9 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
return COMPARATOR;
}
- /**
- * If we have non-zero R in memory, we can return false right away.
- * If we have zero R in memory, try loading one and see if we can find something.
- */
@Override
public boolean isEmpty() {
- return index.byId.isEmpty() && search(Integer.MAX_VALUE, DESC)==null;
+ return search(Integer.MAX_VALUE, DESC)==null;
}
@Override
@@ -349,7 +288,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
}
public R get(int n) {
- return search(n, Direction.EXACT);
+ return getByNumber(n);
}
/**
@@ -367,184 +306,60 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
* If DESC, finds the closest #M that satisfies M<=N.
*/
public @CheckForNull R search(final int n, final Direction d) {
- Entry> c = index.ceilingEntry(n);
- if (c!=null && c.getKey()== n) {
- R r = c.getValue().get();
- if (r!=null)
- return r; // found the exact #n
- }
-
- // at this point we know that we don't have #n loaded yet
-
- {// check numberOnDisk as a cache to see if we can find it there
- int npos = numberOnDisk.find(n);
- if (npos>=0) {// found exact match
- R r = load(numberOnDisk.get(npos), null);
- if (r!=null)
+ switch (d) {
+ case EXACT:
+ return getByNumber(n);
+ case ASC:
+ for (int m : numberOnDisk) {
+ if (m < n) {
+ // TODO could be made more efficient with numberOnDisk.find
+ continue;
+ }
+ R r = getByNumber(m);
+ if (r != null) {
return r;
- }
-
- switch (d) {
- case ASC:
- case DESC:
- // didn't find the exact match, but what's the nearest ascending value in the cache?
- int neighbor = (d==ASC?HIGHER:LOWER).apply(npos);
- if (numberOnDisk.isInRange(neighbor)) {
- R r = getByNumber(numberOnDisk.get(neighbor));
- if (r!=null) {
- // make sure that the cache is accurate by looking at the previous ID
- // and it actually satisfies the constraint
- int prev = (d==ASC?LOWER:HIGHER).apply(idOnDisk.find(getIdOf(r)));
- if (idOnDisk.isInRange(prev)) {
- R pr = getById(idOnDisk.get(prev));
- // sign*sign is making sure that #pr and #r sandwiches #n.
- if (pr!=null && signOfCompare(getNumberOf(pr),n)*signOfCompare(n,getNumberOf(r))>0)
- return r;
- else {
- // cache is lying. there's something fishy.
- // ignore the cache and do the slow search
- }
- } else {
- // r is the build with youngest ID
- return r;
- }
- } else {
- // cache says we should have a build but we didn't.
- // ignore the cache and do the slow search
- }
}
- break;
- case EXACT:
- // fall through
}
-
- // didn't find it in the cache, but don't give up yet
- // maybe the cache just doesn't exist.
- // so fall back to the slow search
- }
-
- // capture the snapshot and work off with it since it can be overwritten by other threads
- SortedList idOnDisk = this.idOnDisk;
- boolean clonedIdOnDisk = false; // if we modify idOnDisk we need to write it back. this flag is set to true when we overwrit idOnDisk local var
-
- // slow path: we have to find the build from idOnDisk by guessing ID of the build.
- // first, narrow down the candidate IDs to try by using two known number-to-ID mapping
- if (idOnDisk.isEmpty()) return null;
-
- Entry> f = index.floorEntry(n);
-
- // if bound is null, use a sentinel value
- String cid = c==null ? "\u0000" : c.getValue().id;
- String fid = f==null ? "\uFFFF" : f.getValue().id;
- // at this point, #n must be in (cid,fid)
-
- // We know that the build we are looking for exists in [lo,hi) --- it's "hi)" and not "hi]" because we do +1.
- // we will narrow this down via binary search
- final int initialSize = idOnDisk.size();
- int lo = idOnDisk.higher(cid);
- int hi = idOnDisk.lower(fid)+1;
-
- final int initialLo = lo, initialHi = hi;
-
- if (!(0<=lo && lo<=hi && hi<=idOnDisk.size())) {
- // assertion error, but we are so far unable to get to the bottom of this bug.
- // but don't let this kill the loading the hard way
- String msg = String.format(
- "JENKINS-15652 Assertion error #1: failing to load %s #%d %s: lo=%d,hi=%d,size=%d,size2=%d",
- dir, n, d, lo, hi, idOnDisk.size(), initialSize);
- LOGGER.log(Level.WARNING, msg);
return null;
- }
-
- while (lo(idOnDisk);
- clonedIdOnDisk = true;
- }
- idOnDisk.remove(pivot);
- continue;
- }
-
- int found = getNumberOf(r);
- if (found==n)
- return r; // exact match
-
- if (found=idOnDisk.size()) {
- // assertion error, but we are so far unable to get to the bottom of this bug.
- // but don't let this kill the loading the hard way
- LOGGER.log(Level.WARNING, String.format(
- "JENKINS-15652 Assertion error #3: failing to load %s #%d %s: lo=%d,hi=%d,size=%d (initial:lo=%d,hi=%d,size=%d)",
- dir, n,d,lo,hi,idOnDisk.size(), initialLo,initialHi,initialSize));
- return null;
+ // TODO again could be made more efficient
+ List reversed = new ArrayList(numberOnDisk);
+ Collections.reverse(reversed);
+ for (int m : reversed) {
+ if (m > n) {
+ continue;
+ }
+ R r = getByNumber(m);
+ if (r != null) {
+ return r;
+ }
}
- return getById(idOnDisk.get(lo-1));
- case EXACT:
- if (hi<=0) return null;
- R r = getById(idOnDisk.get(hi-1));
- if (r==null) return null;
-
- int found = getNumberOf(r);
- if (found==n)
- return r; // exact match
return null;
default:
throw new AssertionError();
}
}
- /**
- * sign of (a-b).
- */
- private static int signOfCompare(int a, int b) {
- if (a>b) return 1;
- if (a ref = snapshot.byId.get(id);
+ if (snapshot.byNumber.containsKey(n)) {
+ BuildReference ref = snapshot.byNumber.get(n);
if (ref==null) return null; // known failure
R v = unwrap(ref);
if (v!=null) return v; // already in memory
// otherwise fall through to load
}
- return load(id,null);
+ return load(n, null);
}
- public R getByNumber(int n) {
- return search(n, Direction.EXACT);
+ protected final synchronized void proposeNewNumber(int number) throws IllegalStateException {
+ if (numberOnDisk.isInRange(numberOnDisk.ceil(number))) {
+ throw new IllegalStateException("cannot create a build with number " + number + " since that (or higher) is already in use among " + numberOnDisk);
+ }
}
public R put(R value) {
@@ -557,27 +372,13 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
@Override
public synchronized R put(Integer key, R r) {
- String id = getIdOf(r);
int n = getNumberOf(r);
Index copy = copy();
BuildReference ref = createReference(r);
- BuildReference old = copy.byId.put(id,ref);
- copy.byNumber.put(n,ref);
+ BuildReference old = copy.byNumber.put(n,ref);
index = copy;
- /*
- search relies on the fact that every object added via
- put() method be available in the xyzOnDisk index, so I'm adding them here
- however, this is awfully inefficient. I wonder if there's any better way to do this?
- */
- if (!idOnDisk.contains(id)) {
- ArrayList a = new ArrayList(idOnDisk);
- a.add(id);
- Collections.sort(a);
- idOnDisk = new SortedList(a);
- }
-
if (!numberOnDisk.contains(n)) {
SortedIntList a = new SortedIntList(numberOnDisk);
a.add(n);
@@ -598,9 +399,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
public synchronized void putAll(Map rhs) {
Index copy = copy();
for (R r : rhs.values()) {
- String id = getIdOf(r);
BuildReference ref = createReference(r);
- copy.byId.put(id,ref);
copy.byNumber.put(getNumberOf(r),ref);
}
index = copy;
@@ -620,9 +419,9 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
synchronized (this) {
if (!fullyLoaded) {
Index copy = copy();
- for (String id : idOnDisk) {
- if (!copy.byId.containsKey(id))
- load(id,copy);
+ for (Integer number : numberOnDisk) {
+ if (!copy.byNumber.containsKey(number))
+ load(number, copy);
}
index = copy;
fullyLoaded = true;
@@ -640,42 +439,18 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
}
/**
- * Tries to load the record #N by using the shortcut.
+ * Tries to load the record #N.
*
* @return null if the data failed to load.
*/
protected R load(int n, Index editInPlace) {
- R r = null;
- File shortcut = new File(dir,String.valueOf(n));
- if (shortcut.isDirectory()) {
- synchronized (this) {
- r = load(shortcut,editInPlace);
-
- // make sure what we actually loaded is #n,
- // because the shortcuts can lie.
- if (r!=null && getNumberOf(r)!=n)
- r = null;
-
- if (r==null) {
- // if failed to locate, record that fact
- SortedIntList update = new SortedIntList(numberOnDisk);
- update.removeValue(n);
- numberOnDisk = update;
- }
- }
- }
- return r;
- }
-
-
- protected R load(String id, Index editInPlace) {
assert dir != null;
- R v = load(new File(dir, id), editInPlace);
+ R v = load(new File(dir, String.valueOf(n)), editInPlace);
if (v==null && editInPlace!=null) {
// remember the failure.
// if editInPlace==null, we can create a new copy for this, but not sure if it's worth doing,
- // given that we also update idOnDisk anyway.
- editInPlace.byId.put(id,null);
+ // TODO should we also update numberOnDisk?
+ editInPlace.byNumber.put(n, null);
}
return v;
}
@@ -692,10 +467,9 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
Index copy = editInPlace!=null ? editInPlace : new Index(index);
- String id = getIdOf(r);
BuildReference ref = createReference(r);
- copy.byId.put(id,ref);
- copy.byNumber.put(getNumberOf(r),ref);
+ BuildReference old = copy.byNumber.put(getNumberOf(r), ref);
+ assert old == null || old.get() == null : "tried to overwrite " + old + " with " + ref;
if (editInPlace==null) index = copy;
@@ -710,10 +484,13 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
* Subtype to provide {@link Run#getNumber()} so that this class doesn't have to depend on it.
*/
protected abstract int getNumberOf(R r);
+
/**
* Subtype to provide {@link Run#getId()} so that this class doesn't have to depend on it.
*/
- protected abstract String getIdOf(R r);
+ protected String getIdOf(R r) {
+ return String.valueOf(getNumberOf(r));
+ }
/**
* Allow subtype to capture a reference.
@@ -737,16 +514,15 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
public synchronized boolean removeValue(R run) {
Index copy = copy();
int n = getNumberOf(run);
- copy.byNumber.remove(n);
+ BuildReference old = copy.byNumber.remove(n);
SortedIntList a = new SortedIntList(numberOnDisk);
a.removeValue(n);
numberOnDisk = a;
- BuildReference old = copy.byId.remove(getIdOf(run));
this.index = copy;
entrySet.clearCache();
- return unwrap(old)!=null;
+ return old != null;
}
/**
@@ -755,9 +531,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
public synchronized void reset(TreeMap builds) {
Index index = new Index();
for (R r : builds.values()) {
- String id = getIdOf(r);
BuildReference ref = createReference(r);
- index.byId.put(id,ref);
index.byNumber.put(getNumberOf(r),ref);
}
@@ -774,14 +548,9 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i
return o==this;
}
- /**
- * Lists the actual data directory
- */
- protected abstract FilenameFilter createDirectoryFilter();
-
- private static final Comparator COMPARATOR = new Comparator() {
- public int compare(Comparable o1, Comparable o2) {
- return -o1.compareTo(o2);
+ private static final Comparator COMPARATOR = new Comparator() {
+ @Override public int compare(Integer o1, Integer o2) {
+ return o2 - o1;
}
};
diff --git a/core/src/main/java/jenkins/model/lazy/BuildReference.java b/core/src/main/java/jenkins/model/lazy/BuildReference.java
index cc29fe1d15c2e78ab23b0dfd720f9be66f1b94b9..93546d46e15e7882f25ac6b9491c3574c23e73d5 100644
--- a/core/src/main/java/jenkins/model/lazy/BuildReference.java
+++ b/core/src/main/java/jenkins/model/lazy/BuildReference.java
@@ -66,7 +66,7 @@ public final class BuildReference {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- BuildReference that = (BuildReference) o;
+ BuildReference that = (BuildReference) o;
return id.equals(that.id);
}
@@ -76,6 +76,11 @@ public final class BuildReference {
return id.hashCode();
}
+ @Override public String toString() {
+ R r = get();
+ return r != null ? r.toString() : id;
+ }
+
/**
* An abstraction of {@link Reference}.
* @since 1.548
diff --git a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
index 095a7358cbad3453aeb3657a79540917772bb28c..99c48f820b1357a39f3636603852eb09a04577e1 100644
--- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
+++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
@@ -47,6 +47,7 @@ import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.DoNotUse;
import static java.util.logging.Level.FINER;
+import jenkins.model.RunIdMigrator;
/**
* Makes it easier to use a lazy {@link RunMap} from a {@link Job} implementation.
@@ -63,9 +64,6 @@ public abstract class LazyBuildMixIn & Queue.Task &
@SuppressWarnings("deprecation") // [JENKINS-15156] builds accessed before onLoad or onCreatedFromScratch called
private @Nonnull RunMap builds = new RunMap();
- // keep track of the previous time we started a build
- private long lastBuildStartTime;
-
/**
* Initializes this mixin.
* Call this from a constructor and {@link AbstractItem#onLoad} to make sure it is always initialized.
@@ -92,14 +90,14 @@ public abstract class LazyBuildMixIn & Queue.Task &
}
/**
- * Something to be called from {@link AbstractItem#onCreatedFromScratch}.
+ * Something to be called from {@link Job#onCreatedFromScratch}.
*/
public final void onCreatedFromScratch() {
builds = createBuildRunMap();
}
/**
- * Something to be called from {@link AbstractItem#onLoad}.
+ * Something to be called from {@link Job#onLoad}.
*/
@SuppressWarnings("unchecked")
public void onLoad(ItemGroup parent, String name) throws IOException {
@@ -123,7 +121,8 @@ public abstract class LazyBuildMixIn & Queue.Task &
// if we are reloading, keep all those that are still building intact
for (RunT r : currentBuilds.getLoadedBuilds().values()) {
if (r.isBuilding()) {
- _builds.put(r);
+ // Do not use RunMap.put(Run):
+ _builds.put(r.getNumber(), r);
}
}
}
@@ -131,11 +130,15 @@ public abstract class LazyBuildMixIn & Queue.Task &
}
private RunMap createBuildRunMap() {
- return new RunMap(asJob().getBuildDir(), new RunMap.Constructor() {
+ RunMap r = new RunMap(asJob().getBuildDir(), new RunMap.Constructor() {
@Override public RunT create(File dir) throws IOException {
return loadBuild(dir);
}
});
+ RunIdMigrator runIdMigrator = asJob().runIdMigrator;
+ assert runIdMigrator != null;
+ r.runIdMigrator = runIdMigrator;
+ return r;
}
/**
@@ -169,19 +172,7 @@ public abstract class LazyBuildMixIn & Queue.Task &
* Calls the ({@link Job}) constructor of {@link #getBuildClass}.
* Suitable for {@link SubTask#createExecutable}.
*/
- @SuppressWarnings("SleepWhileHoldingLock")
- @edu.umd.cs.findbugs.annotations.SuppressWarnings("SWL_SLEEP_WITH_LOCK_HELD")
public final synchronized RunT newBuild() throws IOException {
- // make sure we don't start two builds in the same second
- // so the build directories will be different too
- long timeSinceLast = System.currentTimeMillis() - lastBuildStartTime;
- if (timeSinceLast < 1000) {
- try {
- Thread.sleep(1000 - timeSinceLast);
- } catch (InterruptedException e) {
- }
- }
- lastBuildStartTime = System.currentTimeMillis();
try {
RunT lastBuild = getBuildClass().getConstructor(asJob().getClass()).newInstance(asJob());
builds.put(lastBuild);
diff --git a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java
index 88eb84fc1cce377857ec48937cbb78c6e423ed2d..7821f492fdea3c20e15148745daefa651bccedf9 100644
--- a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java
+++ b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java
@@ -16,6 +16,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;
+import javax.crypto.BadPaddingException;
import org.apache.commons.io.IOUtils;
/**
@@ -106,7 +107,13 @@ public class DefaultConfidentialStore extends ConfidentialStore {
byte[] bytes = IOUtils.toByteArray(cis);
return verifyMagic(bytes);
} catch (GeneralSecurityException e) {
- throw new IOException("Failed to persist the key: "+key.getId(),e);
+ throw new IOException("Failed to load the key: "+key.getId(),e);
+ } catch (IOException x) {
+ if (x.getCause() instanceof BadPaddingException) {
+ return null; // broken somehow
+ } else {
+ throw x;
+ }
} finally {
IOUtils.closeQuietly(cis);
IOUtils.closeQuietly(fis);
diff --git a/core/src/main/java/jenkins/util/AntClassLoader.java b/core/src/main/java/jenkins/util/AntClassLoader.java
index b154a1fab0a62918d97c1ab961a22935f93a5d49..6416a57ddc2c7f8a4c07a1b291c07b4629f0e46d 100644
--- a/core/src/main/java/jenkins/util/AntClassLoader.java
+++ b/core/src/main/java/jenkins/util/AntClassLoader.java
@@ -834,7 +834,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
// designated to use a specific loader first
// (this one or the parent one)
- // XXX - shouldn't this always return false in isolated mode?
+ // TODO shouldn't this always return false in isolated mode?
boolean useParentFirst = parentFirst;
@@ -1573,4 +1573,4 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
return new AntClassLoader(parent, project, path, parentFirst);
}
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/jenkins/util/ErrorLoggingScheduledThreadPoolExecutor.java b/core/src/main/java/jenkins/util/ErrorLoggingScheduledThreadPoolExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..8765af84bf4da1d905097331ee7b9d9a6d7eb1c1
--- /dev/null
+++ b/core/src/main/java/jenkins/util/ErrorLoggingScheduledThreadPoolExecutor.java
@@ -0,0 +1,85 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2015 Jesse Glick.
+ *
+ * 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 jenkins.util;
+
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Executor service that logs otherwise uncaught errors.
+ * TODO is there anything in Guava for this?
+ */
+class ErrorLoggingScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor {
+
+ private static final Logger LOGGER = Logger.getLogger(ErrorLoggingScheduledThreadPoolExecutor.class.getName());
+
+ ErrorLoggingScheduledThreadPoolExecutor(int corePoolSize) {
+ super(corePoolSize);
+ }
+
+ ErrorLoggingScheduledThreadPoolExecutor(int corePoolSize, ThreadFactory threadFactory) {
+ super(corePoolSize, threadFactory);
+ }
+
+ ErrorLoggingScheduledThreadPoolExecutor(int corePoolSize, RejectedExecutionHandler handler) {
+ super(corePoolSize, handler);
+ }
+
+ ErrorLoggingScheduledThreadPoolExecutor(int corePoolSize, ThreadFactory threadFactory, RejectedExecutionHandler handler) {
+ super(corePoolSize, threadFactory, handler);
+ }
+
+ @Override protected void afterExecute(Runnable r, Throwable t) {
+ super.afterExecute(r, t);
+ if (t == null && r instanceof Future) {
+ Future f = (Future) r;
+ if (f.isDone()) { // TODO super Javadoc does not suggest this, but without it, we hang in FutureTask.awaitDone!
+ try {
+ f.get(/* just to be on the safe side, do not wait */0, TimeUnit.NANOSECONDS);
+ } catch (TimeoutException x) {
+ // should not happen, right?
+ } catch (CancellationException x) {
+ // probably best to ignore this
+ } catch (ExecutionException x) {
+ t = x.getCause();
+ } catch (InterruptedException x) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+ if (t != null) {
+ LOGGER.log(Level.WARNING, "failure in task not wrapped in SafeTimerTask", t);
+ }
+ }
+
+}
diff --git a/core/src/main/java/jenkins/util/Timer.java b/core/src/main/java/jenkins/util/Timer.java
index a84162364b4923f8caa1836d327f84e7194000c5..27870fd26babf9cba879ad957851d2ee75275ff4 100644
--- a/core/src/main/java/jenkins/util/Timer.java
+++ b/core/src/main/java/jenkins/util/Timer.java
@@ -1,13 +1,10 @@
package jenkins.util;
-
import hudson.util.DaemonThreadFactory;
import hudson.util.NamingThreadFactory;
import javax.annotation.Nonnull;
-import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-
/**
* Holds the {@link ScheduledExecutorService} for running all background tasks in Jenkins.
* This ExecutorService will create additional threads to execute due (enabled) tasks.
@@ -42,7 +39,7 @@ public class Timer {
if (executorService == null) {
// corePoolSize is set to 10, but will only be created if needed.
// ScheduledThreadPoolExecutor "acts as a fixed-sized pool using corePoolSize threads"
- executorService = Executors.newScheduledThreadPool(10, new NamingThreadFactory(new DaemonThreadFactory(), "jenkins.util.Timer"));
+ executorService = new ErrorLoggingScheduledThreadPoolExecutor(10, new NamingThreadFactory(new DaemonThreadFactory(), "jenkins.util.Timer"));
}
return executorService;
}
diff --git a/core/src/main/resources/hudson/cli/CLIAction/command.jelly b/core/src/main/resources/hudson/cli/CLIAction/command.jelly
index dab20f2867719e867d3394f9336fe7a15445ca70..3dcecdc1ffd01bc975e1b2fc65828032bcc702f0 100644
--- a/core/src/main/resources/hudson/cli/CLIAction/command.jelly
+++ b/core/src/main/resources/hudson/cli/CLIAction/command.jelly
@@ -33,11 +33,11 @@ THE SOFTWARE.
-
${command.longDescription}
-
-
-
${command.usage}
-
+
+
+
+ ${command.usage}
+
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index_hu.properties b/core/src/main/resources/hudson/model/AbstractBuild/index_hu.properties
index 3816c91bf94309e8082df1290fa1b0013e4c9ff7..161a7cf0de02cc86d18a2df8dc567f640350d2e4 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/index_hu.properties
+++ b/core/src/main/resources/hudson/model/AbstractBuild/index_hu.properties
@@ -25,7 +25,7 @@ Build\ Artifacts=\u00C9p\u00EDt\u0151k\u00F6vek
Changes\ in\ dependency=V\u00E1ltoz\u00E1sok a f\u00FCgg\u0151s\u00E9g(ek)ben
Not\ yet\ determined=M\u00E9g nincs feldolgozva
Took=tartott
-beingExecuted=A build {} perce fut
+beingExecuted=A build {0} perce fut
detail=b\u0151vebben
on=@
startedAgo=Elkezd\u0151d\u00F6tt {0}-kor
diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly
index 9adde755c69ce150f893530e9e9b80c8bcdd80eb..ecd9dbf11ec48d753abea8be36d807218b038bcc 100644
--- a/core/src/main/resources/hudson/model/Computer/index.jelly
+++ b/core/src/main/resources/hudson/model/Computer/index.jelly
@@ -94,6 +94,7 @@ THE SOFTWARE.
${entry.item.name}
+
diff --git a/core/src/main/resources/hudson/model/Label/index.jelly b/core/src/main/resources/hudson/model/Label/index.jelly
index 22cd6d0ac3802518a59972b3910e0c71d995c3bd..931d7932df5ea14edb7af58d0489b008281bb565 100644
--- a/core/src/main/resources/hudson/model/Label/index.jelly
+++ b/core/src/main/resources/hudson/model/Label/index.jelly
@@ -50,6 +50,7 @@ THE SOFTWARE.
${c.displayName}
+
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index 1f68d066dce3e8fa739d30cec3143f9751b36e2e..33dfb245cdfe42c0247e909407e7b4a8dbc477ee 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -55,8 +55,9 @@ AbstractProject.BuildPermission.Description=\
This permission grants the ability to start a new build.
AbstractProject.WorkspacePermission.Description=\
This permission grants the ability to retrieve the contents of a workspace \
- Jenkins checked out for performing builds. If you don\u2019t want an user to access \
- the source code, you can do so by revoking this permission.
+ Jenkins checked out for performing builds. If you don\u2019t want a user to access \
+ files in the workspace (e.g. source code checked out from SCM or intermediate build \
+ results) through the workspace browser, you can revoke this permission.
AbstractProject.ExtendedReadPermission.Description=\
This permission grants read-only access to project configurations. Please be \
aware that sensitive information in your builds, such as passwords, will be \
diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties
index e06a0ef8fb949b8431b6ccd00fe615061ef2d8c7..f47d7cb6859bf894c0ff368b92bc7a88d7431f11 100644
--- a/core/src/main/resources/hudson/model/Messages_ja.properties
+++ b/core/src/main/resources/hudson/model/Messages_ja.properties
@@ -152,7 +152,7 @@ Item.READ.description=\u30b8\u30e7\u30d6\u3092\u53c2\u7167\u3057\u307e\u3059\u30
(\u8a31\u53ef\u3057\u306a\u3044\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u304c\u3001\u533f\u540d\u30e6\u30fc\u30b6\u30fc\u304c\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u30b8\u30e7\u30d6\u3092\u53c2\u7167\u3067\u304d\u308b\u3088\u3046\u306b"Discover"\u3092\u8a31\u53ef\u3057\u3066\u304f\u3060\u3055\u3044\u3002)
Job.AllRecentBuildFailed=\u6700\u8fd1\u306e\u5168\u3066\u306e\u30d3\u30eb\u30c9\u306f\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-Job.BuildStability=\u5b89\u5b9a\u3057\u305f\u30d3\u30eb\u30c9: {0}
+Job.BuildStability=\u30d3\u30eb\u30c9\u306e\u5b89\u5b9a\u6027: {0}
Job.NOfMFailed=\u6700\u8fd1\u306e{1}\u500b\u4e2d\u3001{0}\u500b\u30d3\u30eb\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
Job.NoRecentBuildFailed=\u6700\u8fd1\u306e\u30d3\u30eb\u30c9\u306f\u5931\u6557\u3057\u3066\u307e\u305b\u3093\u3002
Job.Pronoun=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/core/src/main/resources/hudson/model/RunParameterValue/value.jelly b/core/src/main/resources/hudson/model/RunParameterValue/value.jelly
index 5191c4d38b6fcf6e79513f07bbb7db5982808c05..019158b4285c0e96266bad2180dc4dfed746e1f8 100644
--- a/core/src/main/resources/hudson/model/RunParameterValue/value.jelly
+++ b/core/src/main/resources/hudson/model/RunParameterValue/value.jelly
@@ -27,6 +27,6 @@ THE SOFTWARE.
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
- ${it.run}
+ ${it.run.fullDisplayName}
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.jelly b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.jelly
index c3139c8deb2844a2658d73a458d263d6947b9a05..60accc8277544a11b21a6267083d62dc382634f8 100644
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.jelly
+++ b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.jelly
@@ -24,5 +24,5 @@ THE SOFTWARE.
-
${%blurb(it.gbLeft, it.path)}
+
${it}
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.properties
deleted file mode 100644
index b819ae6efc3926b1e4897d90e1c42cac1597b1cf..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, 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.
-blurb=Disk space is too low. Only {0}GB left on {1}.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_da.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_da.properties
deleted file mode 100644
index cea15312ae2a9e1840c9564346ef93a3449023f1..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_da.properties
+++ /dev/null
@@ -1,23 +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.
-
-blurb=Disk plads for lav. Kun {0}GB tilbage.
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_de.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_de.properties
deleted file mode 100644
index b5e4ec1f5d00264c999f366a40723fb98fe13c5c..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_de.properties
+++ /dev/null
@@ -1,23 +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.
-
-blurb=Zu wenig Festplattenplatz: Nur noch {0}GB frei.
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_es.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_es.properties
deleted file mode 100644
index fc3c56ea6051c0adbff00241aacafb6672a14a1f..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_es.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, 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.
-blurb=El espacio en disco es muy bajo, slo quedan {0}GB.
-
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_fr.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_fr.properties
deleted file mode 100644
index 10f3c1c96161b1061a5c98f4fc2dadcea550baa8..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_fr.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-blurb=Espace disque insuffisant. Seulement {0} GB restant sur {1}
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_ja.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_ja.properties
deleted file mode 100644
index c8f2f160289e92f95743b40f7ffb7bbd95a7f70d..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_ja.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., 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.
-
-blurb=\u30C7\u30A3\u30B9\u30AF\u5BB9\u91CF\u304C\u5C11\u306A\u3059\u304E\u307E\u3059\u3002\u6B8B\u308A{0}GB\u3067\u3059\u3002
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties
deleted file mode 100644
index a34a5d7f01f56df81b53079444035e9a26b9fee8..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers
-#
-# 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.
-
-# Disk space is too low. Only {0}GB left on {1}.
-blurb=Espa\u00e7o em disco est\u00e1 acabando, apenas {0}Gb livre em {1}.
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties
deleted file mode 100644
index dd77f65782c39180778683aa4b08b2270b26be29..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_pt_BR.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., 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.
-
-# Disk space is too low. Only {0}GB left.
-blurb=Pouco espa\u00e7o em disco. Somente {0}GB restante.
-
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_sv_SE.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_sv_SE.properties
deleted file mode 100644
index 5537bb8e4bd1eae536f315d133260d3c54c33ee5..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_sv_SE.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.
-
-blurb=Diskutrymme l\u00E5gt. Enbart {0}GB kvar.
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_zh_TW.properties b/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_zh_TW.properties
deleted file mode 100644
index 3f970fc0e6884232df4813b7905d1426fac610ad..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_zh_TW.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
-#
-# 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.
-
-blurb=\u78c1\u789f\u7a7a\u9593\u592a\u5c11\u3002{1} \u4e0a\u53ea\u5269 {0}GB\u3002
diff --git a/core/src/main/resources/hudson/node_monitors/Messages.properties b/core/src/main/resources/hudson/node_monitors/Messages.properties
index 001e643a6cd84f5677d7471e8a2dd1ad4c9229b5..4b46e200b1a65846f9a93b3e224cfa16f16d9d74 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages.properties
@@ -31,3 +31,4 @@ ResponseTimeMonitor.TimeOut=Time out for last {0} try
SwapSpaceMonitor.DisplayName=Free Swap Space
TemporarySpaceMonitor.DisplayName=Free Temp Space
AbstractNodeMonitorDescriptor.NoDataYet=Not yet
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Disk space is too low. Only {0}GB left on {1}.
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_cs.properties b/core/src/main/resources/hudson/node_monitors/Messages_cs.properties
similarity index 90%
rename from core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_cs.properties
rename to core/src/main/resources/hudson/node_monitors/Messages_cs.properties
index d74adadeb2cc4b65cca4a4acc0cc98b1aa5168c5..0db0a21c2613f4b492236f1e07697c8eb765cc38 100644
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_cs.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_cs.properties
@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-blurb=M\u00E1lo m\u00EDsta na disku. Zb\u00FDv\u00E1 pouze {0}GB.
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=M\u00E1lo m\u00EDsta na disku. Zb\u00FDv\u00E1 pouze {0}GB.
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_da.properties b/core/src/main/resources/hudson/node_monitors/Messages_da.properties
index 446f325e83ad8486fe20371a13468e8c97a3739e..f6a226902453c048254184122dc4ad136b00e034 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_da.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_da.properties
@@ -29,3 +29,4 @@ SwapSpaceMonitor.DisplayName=Ledig Swap Plads
ArchitectureMonitor.DisplayName=Arkitektur
ResponseTimeMonitor.MarkedOffline=Tager {0} offline midlertidigt da den ikke svarer
ResponseTimeMonitor.DisplayName=Respons Tid
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Disk plads for lav. Kun {0}GB tilbage.
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_de.properties b/core/src/main/resources/hudson/node_monitors/Messages_de.properties
index 4bbeb7475ae99063d274a75e5aee60215b238e79..704bc5835b7d2199845b2b030bdf639787b46d22 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_de.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_de.properties
@@ -29,7 +29,4 @@ ResponseTimeMonitor.MarkedOffline=Nehme {0} tempor
ResponseTimeMonitor.TimeOut= {0} mal keine Antwort
SwapSpaceMonitor.DisplayName=Freier Swap Space
TemporarySpaceMonitor.DisplayName=Freier TEMP-Platz
-
-
-
-
\ No newline at end of file
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Zu wenig Festplattenplatz: Nur noch {0}GB frei.
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_es.properties b/core/src/main/resources/hudson/node_monitors/Messages_es.properties
index 67c6fd3a4502bef1c57b51b3d52fe9892988c4d1..ac098af577b343f95af2276d514fe9e84dd0eb23 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_es.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_es.properties
@@ -29,3 +29,4 @@ ResponseTimeMonitor.MarkedOffline=Poniendo temporalmente {0} fuera de l
ResponseTimeMonitor.TimeOut=Se sobrepas el tiempo de espera en el ltimo intento de {0}
SwapSpaceMonitor.DisplayName=Espacio de intercambio libre
TemporarySpaceMonitor.DisplayName=Espacio temporal libre
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=El espacio en disco es muy bajo, slo quedan {0}GB.
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_fr.properties b/core/src/main/resources/hudson/node_monitors/Messages_fr.properties
index f423b21b807513f29236a3a98a4d625978dbf119..845fd6deb224d0323fdc84e492c654db1080f817 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_fr.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_fr.properties
@@ -28,3 +28,4 @@ ResponseTimeMonitor.DisplayName=Temps de r\u00e9ponse
ResponseTimeMonitor.MarkedOffline={0} est marqu\u00e9 comme d\u00e9connect\u00e9 temporairement, parce qu''il ne r\u00e9pond pas
ResponseTimeMonitor.TimeOut=Time out du dernier essai {0}
SwapSpaceMonitor.DisplayName=Espace de swap disponible
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Espace disque insuffisant. Seulement {0} GB restant sur {1}
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_ja.properties b/core/src/main/resources/hudson/node_monitors/Messages_ja.properties
index 9596aaa52ed641b8d66adde06864517c224f6bfe..9f545b5d8205dfe350f07b875184a22ad44d5e31 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_ja.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_ja.properties
@@ -30,4 +30,5 @@ ResponseTimeMonitor.MarkedOffline=\u5fdc\u7b54\u3057\u306a\u3044\u305f\u3081\u30
ResponseTimeMonitor.TimeOut=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8(\u76f4\u8fd1 {0}\u56de)
SwapSpaceMonitor.DisplayName=\u7a7a\u304d\u30b9\u30ef\u30c3\u30d7\u5bb9\u91cf
TemporarySpaceMonitor.DisplayName=\u7a7a\u304d\u30c6\u30f3\u30dd\u30e9\u30ea\u5bb9\u91cf
-AbstractNodeMonitorDescriptor.NoDataYet=\u30c7\u30fc\u30bf\u672a\u53d6\u5f97
\ No newline at end of file
+AbstractNodeMonitorDescriptor.NoDataYet=\u30c7\u30fc\u30bf\u672a\u53d6\u5f97
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=\u30C7\u30A3\u30B9\u30AF\u5BB9\u91CF\u304C\u5C11\u306A\u3059\u304E\u307E\u3059\u3002\u6B8B\u308A{0}GB\u3067\u3059\u3002
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_nl.properties b/core/src/main/resources/hudson/node_monitors/Messages_nl.properties
index 37456470772eb8f7e752db0d7bd456020a50a406..4a0fecb3a35abb09e26949983215f4d7ed617a43 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_nl.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_nl.properties
@@ -22,4 +22,5 @@
ArchitectureMonitor.DisplayName=Architectuur
ClockMonitor.DisplayName=Tijdsverschil
-DiskSpaceMonitor.DisplayName=Beschikbare schijfruimte
\ No newline at end of file
+DiskSpaceMonitor.DisplayName=Beschikbare schijfruimte
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Er is te weinig vrije schijfruimte, nog maar {0} GB over.
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_pt.properties b/core/src/main/resources/hudson/node_monitors/Messages_pt.properties
index e9eb9c1b26cbac784def494999bee185b31df01a..f19690280c0154d51b635cc8c50d8776679ca178 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_pt.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_pt.properties
@@ -31,3 +31,4 @@ DiskSpaceMonitor.DisplayName=Espa\u00e7o em disco livre
SwapSpaceMonitor.DisplayName=Espa\u00e7o de swap livre
ArchitectureMonitor.DisplayName=Arquitetura
ResponseTimeMonitor.MarkedOffline=Deixar {0} offline porque n\u00e3o est\u00e1 respondendo
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Espa\u00e7o em disco est\u00e1 acabando, apenas {0}Gb livre em {1}.
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties b/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties
index 68e2b049607d865ab891962124968eead3ce4512..a55804ed54a7d9a75eedd39061c26db3a627853d 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_pt_BR.properties
@@ -39,3 +39,5 @@ ResponseTimeMonitor.MarkedOffline= Indispon\u00edvel temporariamente por que n\u
AbstractNodeMonitorDescriptor.NoDataYet=Nada ainda
# Putting {0} back online as there is enough disk space again
DiskSpaceMonitor.MarkedOnline=Retornando {0} para online pois h\u00e1 espa\u00e7o em disco suficiente novamente
+# Disk space is too low. Only {0}GB left.
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Pouco espa\u00e7o em disco. Somente {0}GB restante.
diff --git a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_nl.properties b/core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
similarity index 92%
rename from core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_nl.properties
rename to core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
index 85e0a89671935c09d42752b514072b5e4ed44d27..1b0ae43692ea34d8e88003515a11d31fa7bc3752 100644
--- a/core/src/main/resources/hudson/node_monitors/DiskSpaceMonitorDescriptor/DiskSpace/cause_nl.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-blurb=Er is te weinig vrije schijfruimte, nog maar {0} GB over.
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=Diskutrymme l\u00E5gt. Enbart {0}GB kvar.
diff --git a/core/src/main/resources/hudson/node_monitors/Messages_zh_TW.properties b/core/src/main/resources/hudson/node_monitors/Messages_zh_TW.properties
index edfaae5ae4bf0fb9fe395f68e303cf32a791b890..63ebb23af2d9ac6b22c1be18f7fce36bd0d36b6d 100644
--- a/core/src/main/resources/hudson/node_monitors/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/node_monitors/Messages_zh_TW.properties
@@ -30,3 +30,4 @@ ResponseTimeMonitor.MarkedOffline={0} \u6c92\u6709\u56de\u61c9\uff0c\u5c07\u5176
ResponseTimeMonitor.TimeOut=\u6700\u8fd1 {0} \u6b21\u9023\u7dda\u90fd\u903e\u6642
SwapSpaceMonitor.DisplayName=\u53ef\u7528 Swap \u7a7a\u9593
TemporarySpaceMonitor.DisplayName=\u53ef\u7528\u66ab\u5b58\u7a7a\u9593
+DiskSpaceMonitorDescriptor.DiskSpace.FreeSpaceTooLow=\u78c1\u789f\u7a7a\u9593\u592a\u5c11\u3002{1} \u4e0a\u53ea\u5269 {0}GB\u3002
diff --git a/core/src/main/resources/hudson/security/SecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..9f054b876cfefab2dba382142585351494f3f8e8
--- /dev/null
+++ b/core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
${%Sign up}
+ ${%This is not supported in the current configuration.}
+
+
+
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
index a2b3407af42782855cfcf07535127211ea78d3b4..667e123f29eaf03ea62eccdf28b61f2aa63980c1 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
@@ -56,9 +56,7 @@ THE SOFTWARE.
-
-
-
+
@@ -76,9 +74,7 @@ THE SOFTWARE.
-
-
-
+
diff --git a/core/src/main/resources/jenkins/diagnostics/ooom/Messages.properties b/core/src/main/resources/jenkins/diagnostics/ooom/Messages.properties
deleted file mode 100644
index 94f27977b1fc458237dad554e4b50cff710ce8b7..0000000000000000000000000000000000000000
--- a/core/src/main/resources/jenkins/diagnostics/ooom/Messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-Problem.DisplayName={0} builds have inconsistent timestamps in {1}
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.groovy b/core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.groovy
deleted file mode 100644
index 27f62dde930dfa46a68095e063b23471e26e7e0a..0000000000000000000000000000000000000000
--- a/core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.groovy
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-The MIT License
-
-Copyright (c) 2013, CloudBees, 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 jenkins.diagnostics.ooom.OutOfOrderBuildMonitor
-
-import jenkins.diagnostics.ooom.BuildPtr
-import jenkins.diagnostics.ooom.Problem;
-
-def f = namespace(lib.FormTagLib)
-
-if (my.isFixingActive()) {
- div(class:"info") {
- raw _("inProgress",my.url)
- }
-} else if (my.logFile.exists()) {
- form(method:"POST",action:"${my.url}/dismiss",name:"dismissOutOfOrderBuilds") {
- raw _("completed",my.url)
- f.submit(name:"dismiss",value:_("Dismiss this message"))
- }
-}
-
-if (!my.problems.isEmpty()) {
- form(method:"POST",action:"${my.url}/fix",name:"fixOutOfOrderBuilds") {
- div(class:"warning") {
- raw _("buildsAreOutOfOrder")
- }
- ul {
- my.problems.each { Problem p ->
- li {
-
- raw(_("problem",
- p.countInconsistencies(),
- p.job.fullDisplayName,
- rootURL+'/'+p.job.url))
-
- text(" : ")
- p.offenders.each { BuildPtr o ->
- a(href:rootURL+'/'+p.job.url+'/'+o.n, "#${o.n}")
-
- raw(" ")
- }
- }
- }
- }
-
- div(align:"right") {
- f.submit(name:"fix",value:_("Correct those problems by moving offending records to a backup folder"))
- }
- }
-}
diff --git a/core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.properties b/core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.properties
deleted file mode 100644
index e401c265511d94bd5cec5d4fdf4df95afc57799c..0000000000000000000000000000000000000000
--- a/core/src/main/resources/jenkins/diagnostics/ooom/OutOfOrderBuildMonitor/message.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-problem={0} builds in {1}
-buildsAreOutOfOrder=Some projects have builds whose timestamps are inconsistent. \
- These will confuse Jenkins when it tries to look up build records.
-inProgress=Out-of-order builds are being swept under the carpet. You can check the log.
-completed=Out-of-order builds were swept under the carpet. You can check the log.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy b/core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy
index 07d6b6dd65dcd93f10ae0b8ffedaa081f5c8713e..8b13c1ab114a88e3f58523c0a76b9f26670c0ce7 100644
--- a/core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy
+++ b/core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy
@@ -5,9 +5,7 @@ def f=namespace(lib.FormTagLib)
f.entry(title:_("# of executors"), field:"numExecutors") {
f.number(clazz:"number", min:0, step:1)
}
-if (!app.slaves.isEmpty() || !app.clouds.isEmpty()) {
- f.entry(title:_("Labels"),field:"labelString") {
- f.textbox()
- }
- f.slave_mode(name:"master.mode",node:app)
+f.entry(title:_("Labels"),field:"labelString") {
+ f.textbox()
}
+f.slave_mode(name:"master.mode",node:app)
diff --git a/core/src/main/resources/jenkins/model/RunIdMigrator/UnmigrationInstruction/index.jelly b/core/src/main/resources/jenkins/model/RunIdMigrator/UnmigrationInstruction/index.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..6385169b5dee33b39c778ca14c1769234d5040e9
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/RunIdMigrator/UnmigrationInstruction/index.jelly
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+ To reverse the effect of JENKINS-24380 fix, run the following command
+ on the server. See Wiki page
+ for more details:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/src/main/resources/lib/form/class-entry.jelly b/core/src/main/resources/lib/form/class-entry.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..e03af3a754661f219fbe7e7c1695192eb1a601a3
--- /dev/null
+++ b/core/src/main/resources/lib/form/class-entry.jelly
@@ -0,0 +1,47 @@
+
+
+
+
+ Invisible <f:entry> type for embedding a descriptor's $class field.
+
+ The describable class that we are instantiating via structured form submission.
+
+
+ The descriptor of the describable that we are instantiating via
+ structured form submission. Mutually exclusive with clazz.
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/descriptorRadioList.jelly b/core/src/main/resources/lib/form/descriptorRadioList.jelly
index 5193df8043deab141e84528fa2e47cc82c2ec52b..6e20b815e682045806b04cc3e06757d93a7e18e8 100644
--- a/core/src/main/resources/lib/form/descriptorRadioList.jelly
+++ b/core/src/main/resources/lib/form/descriptorRadioList.jelly
@@ -53,9 +53,7 @@ THE SOFTWARE.
title="${d.displayName}" checked="${instance.descriptor==d}">
-
-
-
+
diff --git a/core/src/main/resources/lib/form/dropdownListBlock.jelly b/core/src/main/resources/lib/form/dropdownListBlock.jelly
index d06278a6734f59178040be5beaa0a533d7ba6159..426c61fd41d0cc7933a17dd485d0dab68b66d223 100644
--- a/core/src/main/resources/lib/form/dropdownListBlock.jelly
+++ b/core/src/main/resources/lib/form/dropdownListBlock.jelly
@@ -50,11 +50,7 @@ THE SOFTWARE.
-
-
-
-
-
+
@@ -65,6 +61,9 @@ THE SOFTWARE.
+
+
+
diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly
index 985f687e3a0f5102e7663d4818088faa2696a1f4..0f969e2aba4ef3261ad39fc55f0e31f92eae11ac 100644
--- a/core/src/main/resources/lib/form/hetero-list.jelly
+++ b/core/src/main/resources/lib/form/hetero-list.jelly
@@ -91,14 +91,13 @@ THE SOFTWARE.
+
diff --git a/core/src/test/java/hudson/BulkChangeTest.java b/core/src/test/java/hudson/BulkChangeTest.java
index 449e28d2fc16aba7bcfee2f0869642ebede7c078..7fe79c8383eca962ac70929046f793c9b559cb1c 100644
--- a/core/src/test/java/hudson/BulkChangeTest.java
+++ b/core/src/test/java/hudson/BulkChangeTest.java
@@ -1,18 +1,18 @@
/*
* 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
@@ -23,8 +23,10 @@
*/
package hudson;
+import static org.junit.Assert.assertEquals;
+
import hudson.model.Saveable;
-import junit.framework.TestCase;
+import org.junit.Test;
import java.io.IOException;
@@ -33,7 +35,7 @@ import java.io.IOException;
*
* @author Kohsuke Kawaguchi
*/
-public class BulkChangeTest extends TestCase {
+public class BulkChangeTest {
private class Point implements Saveable {
/**
@@ -68,7 +70,8 @@ public class BulkChangeTest extends TestCase {
/**
* If there is no BulkChange, we should see two saves.
*/
- public void testNoBulkChange() throws Exception {
+ @Test
+ public void noBulkChange() throws Exception {
Point pt = new Point();
pt.set(0,0);
assertEquals(2,pt.saveCount);
@@ -77,7 +80,8 @@ public class BulkChangeTest extends TestCase {
/**
* With a {@link BulkChange}, this will become just one save.
*/
- public void testBulkChange() throws Exception {
+ @Test
+ public void bulkChange() throws Exception {
Point pt = new Point();
BulkChange bc = new BulkChange(pt);
try {
@@ -91,7 +95,8 @@ public class BulkChangeTest extends TestCase {
/**
* {@link BulkChange}s can be nested.
*/
- public void testNestedBulkChange() throws Exception {
+ @Test
+ public void nestedBulkChange() throws Exception {
Point pt = new Point();
Point _ = new Point();
BulkChange bc1 = new BulkChange(pt);
diff --git a/core/src/test/java/hudson/ChannelTestCase.java b/core/src/test/java/hudson/ChannelRule.java
similarity index 92%
rename from core/src/test/java/hudson/ChannelTestCase.java
rename to core/src/test/java/hudson/ChannelRule.java
index decfceee34d3dc6cfc3443f967f8b87b90985590..b94adc489840ad9de5f84b17fe508e6fd44b70ea 100644
--- a/core/src/test/java/hudson/ChannelTestCase.java
+++ b/core/src/test/java/hudson/ChannelRule.java
@@ -1,33 +1,31 @@
package hudson;
-import junit.framework.TestCase;
+import hudson.remoting.Channel;
+import hudson.remoting.FastPipedInputStream;
+import hudson.remoting.FastPipedOutputStream;
import java.io.IOException;
-import java.util.concurrent.Future;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-
-import hudson.remoting.Channel;
-import hudson.remoting.FastPipedInputStream;
-import hudson.remoting.FastPipedOutputStream;
+import java.util.concurrent.Future;
+import org.junit.rules.ExternalResource;
/**
* Test that uses a connected channel.
*
* @author Kohsuke Kawaguchi
*/
-public abstract class ChannelTestCase extends TestCase {
+public final class ChannelRule extends ExternalResource {
/**
* Two channels that are connected to each other, but shares the same classloader.
*/
- protected Channel french;
- protected Channel british;
- private ExecutorService executors = Executors.newCachedThreadPool();
+ public Channel french;
+ public Channel british;
+ private ExecutorService executors;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Override protected void before() throws Exception {
+ executors = Executors.newCachedThreadPool();
final FastPipedInputStream p1i = new FastPipedInputStream();
final FastPipedInputStream p2i = new FastPipedInputStream();
final FastPipedOutputStream p1o = new FastPipedOutputStream(p1i);
@@ -47,8 +45,7 @@ public abstract class ChannelTestCase extends TestCase {
british = f2.get();
}
- @Override
- protected void tearDown() throws Exception {
+ @Override protected void after() {
try {
french.close(); // this will automatically initiate the close on the other channel, too.
french.join();
@@ -98,6 +95,8 @@ public abstract class ChannelTestCase extends TestCase {
*/
e.printStackTrace();
+ } catch (InterruptedException x) {
+ throw new AssertionError(x);
}
executors.shutdownNow();
}
diff --git a/core/src/test/java/hudson/EnvVarsTest.java b/core/src/test/java/hudson/EnvVarsTest.java
index 1da7b5168682c2704afe5a02c9bf5781bb18b8d8..20a9a03ae515fc96b7ee275c04832ad82463403f 100644
--- a/core/src/test/java/hudson/EnvVarsTest.java
+++ b/core/src/test/java/hudson/EnvVarsTest.java
@@ -1,18 +1,18 @@
/*
* 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
@@ -23,8 +23,10 @@
*/
package hudson;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import hudson.EnvVars.OverrideOrderCalculator;
-import junit.framework.TestCase;
import java.util.Arrays;
import java.util.Collections;
@@ -32,25 +34,26 @@ import java.util.HashSet;
import java.util.List;
import com.google.common.collect.Sets;
+import org.junit.Test;
/**
* @author Kohsuke Kawaguchi
*/
-public class EnvVarsTest extends TestCase {
- /**
- * Makes sure that {@link EnvVars} behave in case-insensitive way.
- */
- public void test1() {
+public class EnvVarsTest {
+
+ @Test
+ public void caseInsensitive() {
EnvVars ev = new EnvVars(Collections.singletonMap("Path","A:B:C"));
assertTrue(ev.containsKey("PATH"));
assertEquals("A:B:C",ev.get("PATH"));
}
-
- public void testOverrideExpandingAll() throws Exception {
+
+ @Test
+ public void overrideExpandingAll() {
EnvVars env = new EnvVars();
env.put("PATH", "orig");
env.put("A", "Value1");
-
+
EnvVars overrides = new EnvVars();
overrides.put("PATH", "append" + Platform.current().pathSeparator + "${PATH}");
overrides.put("B", "${A}Value2");
@@ -58,14 +61,15 @@ public class EnvVarsTest extends TestCase {
overrides.put("D", "${E}");
overrides.put("E", "Value3");
overrides.put("PATH+TEST", "another");
-
+
env.overrideExpandingAll(overrides);
-
+
assertEquals("Value1Value2Value3", env.get("C"));
assertEquals("another" + Platform.current().pathSeparator + "append" + Platform.current().pathSeparator + "orig", env.get("PATH"));
}
-
- public void testOverrideOrderCalculatorSimple() {
+
+ @Test
+ public void overrideOrderCalculatorSimple() {
EnvVars env = new EnvVars();
EnvVars overrides = new EnvVars();
overrides.put("A", "NoReference");
@@ -73,14 +77,15 @@ public class EnvVarsTest extends TestCase {
overrides.put("B", "Refer1${A}");
overrides.put("C", "Refer2${B}");
overrides.put("D", "Refer3${B}${Nosuch}");
-
+
OverrideOrderCalculator calc = new OverrideOrderCalculator(env, overrides);
-
+
List order = calc.getOrderedVariableNames();
assertEquals(Arrays.asList("A", "B", "C", "D", "A+B"), order);
}
-
- public void testOverrideOrderCalculatorInOrder() {
+
+ @Test
+ public void overrideOrderCalculatorInOrder() {
EnvVars env = new EnvVars();
EnvVars overrides = new EnvVars();
overrides.put("A", "NoReference");
@@ -88,45 +93,48 @@ public class EnvVarsTest extends TestCase {
overrides.put("C", "${B}");
overrides.put("D", "${E}");
overrides.put("E", "${C}");
-
+
OverrideOrderCalculator calc = new OverrideOrderCalculator(env, overrides);
List order = calc.getOrderedVariableNames();
assertEquals(Arrays.asList("A", "B", "C", "E", "D"), order);
}
-
- public void testOverrideOrderCalculatorMultiple() {
+
+ @Test
+ public void overrideOrderCalculatorMultiple() {
EnvVars env = new EnvVars();
EnvVars overrides = new EnvVars();
overrides.put("A", "Noreference");
overrides.put("B", "${A}");
overrides.put("C", "${A}${B}");
-
+
OverrideOrderCalculator calc = new OverrideOrderCalculator(env, overrides);
List order = calc.getOrderedVariableNames();
assertEquals(Arrays.asList("A", "B", "C"), order);
}
-
- public void testOverrideOrderCalculatorSelfReference() {
+
+ @Test
+ public void overrideOrderCalculatorSelfReference() {
EnvVars env = new EnvVars();
EnvVars overrides = new EnvVars();
overrides.put("PATH", "some;${PATH}");
-
+
OverrideOrderCalculator calc = new OverrideOrderCalculator(env, overrides);
List order = calc.getOrderedVariableNames();
assertEquals(Arrays.asList("PATH"), order);
}
-
- public void testOverrideOrderCalculatorCyclic() {
+
+ @Test
+ public void overrideOrderCalculatorCyclic() {
EnvVars env = new EnvVars();
env.put("C", "Existing");
EnvVars overrides = new EnvVars();
overrides.put("A", "${B}");
overrides.put("B", "${C}"); // This will be ignored.
overrides.put("C", "${A}");
-
+
overrides.put("D", "${C}${E}");
overrides.put("E", "${C}${D}");
-
+
OverrideOrderCalculator calc = new OverrideOrderCalculator(env, overrides);
List order = calc.getOrderedVariableNames();
assertEquals(Arrays.asList("B", "A", "C"), order.subList(0, 3));
diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java
index 3fe2788f20e838c931cf579b754a5cf1f00460ae..999b3e792cf3d0ffeaced08ecb1dfe413f9307fb 100644
--- a/core/src/test/java/hudson/FilePathTest.java
+++ b/core/src/test/java/hudson/FilePathTest.java
@@ -27,13 +27,7 @@ import hudson.FilePath.TarCompression;
import hudson.model.TaskListener;
import hudson.remoting.VirtualChannel;
import hudson.util.NullStream;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.output.NullOutputStream;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Chmod;
-import org.jvnet.hudson.test.Bug;
-import org.mockito.Mockito;
-
+import hudson.util.StreamTaskListener;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -41,6 +35,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
@@ -56,18 +51,29 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.output.NullOutputStream;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Chmod;
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.jvnet.hudson.test.Issue;
-
+import org.mockito.Mockito;
import static org.mockito.Mockito.*;
/**
* @author Kohsuke Kawaguchi
*/
-public class FilePathTest extends ChannelTestCase {
+public class FilePathTest {
- public void testCopyTo() throws Exception {
- File tmp = File.createTempFile("testCopyTo","");
- FilePath f = new FilePath(french,tmp.getPath());
+ @Rule public ChannelRule channels = new ChannelRule();
+ @Rule public TemporaryFolder temp = new TemporaryFolder();
+
+ @Test public void copyTo() throws Exception {
+ File tmp = temp.newFile();
+ FilePath f = new FilePath(channels.french, tmp.getPath());
f.copyTo(new NullStream());
assertTrue("target does not exist", tmp.exists());
assertTrue("could not delete target " + tmp.getPath(), tmp.delete());
@@ -79,12 +85,12 @@ public class FilePathTest extends ChannelTestCase {
*/
// TODO: this test is much too slow to be a traditional unit test. Should be extracted into some stress test
// which is no part of the default test harness?
- public void testNoFileLeakInCopyTo() throws Exception {
+ @Test public void noFileLeakInCopyTo() throws Exception {
for (int j=0; j<2500; j++) {
- File tmp = File.createTempFile("testCopyFrom","");
+ File tmp = temp.newFile();
FilePath f = new FilePath(tmp);
- File tmp2 = File.createTempFile("testCopyTo","");
- FilePath f2 = new FilePath(british,tmp2.getPath());
+ File tmp2 = temp.newFile();
+ FilePath f2 = new FilePath(channels.british, tmp2.getPath());
f.copyTo(f2);
@@ -105,11 +111,10 @@ public class FilePathTest extends ChannelTestCase {
*
* Also see JENKINS-7897
*/
- @Bug(7871)
- public void testNoRaceConditionInCopyTo() throws Exception {
- final File tmp = File.createTempFile("testNoRaceConditionInCopyTo","");
+ @Issue("JENKINS-7871")
+ @Test public void noRaceConditionInCopyTo() throws Exception {
+ final File tmp = temp.newFile();
- try {
int fileSize = 90000;
givenSomeContentInFile(tmp, fileSize);
@@ -119,9 +124,6 @@ public class FilePathTest extends ChannelTestCase {
// THEN copied count was always equal the expected size
for (Future f : results)
assertEquals(fileSize,f.get().intValue());
- } finally {
- tmp.delete();
- }
}
private void givenSomeContentInFile(File file, int size) throws IOException {
@@ -173,7 +175,7 @@ public class FilePathTest extends ChannelTestCase {
}
}
- FilePath f = new FilePath(french, file.getPath());
+ FilePath f = new FilePath(channels.french, file.getPath());
Sink sink = new Sink();
f.copyTo(sink);
return sink.count;
@@ -189,31 +191,24 @@ public class FilePathTest extends ChannelTestCase {
}
}
- public void testRepeatCopyRecursiveTo() throws Exception {
+ @Test public void repeatCopyRecursiveTo() throws Exception {
// local->local copy used to return 0 if all files were "up to date"
// should return number of files processed, whether or not they were copied or already current
- File tmp = Util.createTempDir(), src = new File(tmp, "src"), dst = new File(tmp, "dst");
- try {
- assertTrue(src.mkdir());
- assertTrue(dst.mkdir());
+ File src = temp.newFolder("src");
+ File dst = temp.newFolder("dst");
File.createTempFile("foo", ".tmp", src);
FilePath fp = new FilePath(src);
assertEquals(1, fp.copyRecursiveTo(new FilePath(dst)));
// copy again should still report 1
assertEquals(1, fp.copyRecursiveTo(new FilePath(dst)));
- } finally {
- Util.deleteRecursive(tmp);
- }
}
- @Bug(9540)
- public void testErrorMessageInRemoteCopyRecursive() throws Exception {
- File tmp = Util.createTempDir();
- try {
- File src = new File(tmp, "src");
- File dst = new File(tmp, "dst");
+ @Issue("JENKINS-9540")
+ @Test public void errorMessageInRemoteCopyRecursive() throws Exception {
+ File src = temp.newFolder("src");
+ File dst = temp.newFolder("dst");
FilePath from = new FilePath(src);
- FilePath to = new FilePath(british, dst.getAbsolutePath());
+ FilePath to = new FilePath(channels.british, dst.getAbsolutePath());
for (int i = 0; i < 10000; i++) {
// TODO is there a simpler way to force the TarOutputStream to be flushed and the reader to start?
// Have not found a way to make the failure guaranteed.
@@ -241,24 +236,17 @@ public class FilePathTest extends ChannelTestCase {
} finally {
toF.chmod(700);
}
- } finally {
- Util.deleteRecursive(tmp);
- }
}
- public void testArchiveBug4039() throws Exception {
- File tmp = Util.createTempDir();
- try {
- FilePath d = new FilePath(french,tmp.getPath());
+ @Issue("JENKINS-4039")
+ @Test public void archiveBug() throws Exception {
+ FilePath d = new FilePath(channels.french, temp.getRoot().getPath());
d.child("test").touch(0);
d.zip(new NullOutputStream());
d.zip(new NullOutputStream(),"**/*");
- } finally {
- Util.deleteRecursive(tmp);
- }
}
- public void testNormalization() throws Exception {
+ @Test public void normalization() throws Exception {
compare("abc/def\\ghi","abc/def\\ghi"); // allow mixed separators
{// basic '.' trimming
@@ -285,7 +273,7 @@ public class FilePathTest extends ChannelTestCase {
compare("abc/..",".");
compare(".",".");
- // @Bug(5951)
+ // @Issue("JENKINS-5951")
compare("C:\\Hudson\\jobs\\foo\\workspace/../../otherjob/workspace/build.xml",
"C:\\Hudson\\jobs/otherjob/workspace/build.xml");
// Other cases that failed before
@@ -311,8 +299,8 @@ public class FilePathTest extends ChannelTestCase {
assertEquals(answer,new FilePath((VirtualChannel)null,original).getRemote());
}
- // @Bug(6494)
- public void testGetParent() throws Exception {
+ @Issue("JENKINS-6494")
+ @Test public void getParent() throws Exception {
FilePath fp = new FilePath((VirtualChannel)null, "/abc/def");
assertEquals("/abc", (fp = fp.getParent()).getRemote());
assertEquals("/", (fp = fp.getParent()).getRemote());
@@ -338,9 +326,8 @@ public class FilePathTest extends ChannelTestCase {
return new FilePath(building);
}
- public void testList() throws Exception {
- File baseDir = Util.createTempDir();
- try {
+ @Test public void list() throws Exception {
+ File baseDir = temp.getRoot();
final Set expected = new HashSet();
expected.add(createFilePath(baseDir, "top", "sub", "app.log"));
expected.add(createFilePath(baseDir, "top", "sub", "trace.log"));
@@ -348,14 +335,10 @@ public class FilePathTest extends ChannelTestCase {
expected.add(createFilePath(baseDir, "top", "db", "trace.log"));
final FilePath[] result = new FilePath(baseDir).list("**");
assertEquals(expected, new HashSet(Arrays.asList(result)));
- } finally {
- Util.deleteRecursive(baseDir);
- }
}
- public void testListWithExcludes() throws Exception {
- File baseDir = Util.createTempDir();
- try {
+ @Test public void listWithExcludes() throws Exception {
+ File baseDir = temp.getRoot();
final Set expected = new HashSet();
expected.add(createFilePath(baseDir, "top", "sub", "app.log"));
createFilePath(baseDir, "top", "sub", "trace.log");
@@ -363,14 +346,10 @@ public class FilePathTest extends ChannelTestCase {
createFilePath(baseDir, "top", "db", "trace.log");
final FilePath[] result = new FilePath(baseDir).list("**", "**/trace.log");
assertEquals(expected, new HashSet(Arrays.asList(result)));
- } finally {
- Util.deleteRecursive(baseDir);
- }
}
- public void testListWithDefaultExcludes() throws Exception {
- File baseDir = Util.createTempDir();
- try {
+ @Test public void listWithDefaultExcludes() throws Exception {
+ File baseDir = temp.getRoot();
final Set expected = new HashSet