mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 13:32:24 +00:00
[FIXED JENKINS-24825] define hudson.model.AbstractItem#movedTo
(cherry picked from commit 9b3f48853d)
Conflicts:
changelog.html
This commit is contained in:
1 parent
034919e1fd
commit
a4a28fb87f
3 files changed
+21
-1
No files matched your search
@@ -41,6 +41,7 @@ import hudson.util.AlternativeUiTextProvider;
|
||||
import hudson.util.AlternativeUiTextProvider.Message;
|
||||
import hudson.util.AtomicFileWriter;
|
||||
import hudson.util.IOUtils;
|
||||
import jenkins.model.DirectlyModifiableTopLevelItemGroup;
|
||||
import jenkins.model.Jenkins;
|
||||
import jenkins.security.NotReallyRoleSensitiveCallable;
|
||||
import org.acegisecurity.Authentication;
|
||||
@@ -324,6 +325,10 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
|
||||
}
|
||||
}
|
||||
|
||||
public void movedTo(DirectlyModifiableTopLevelItemGroup destination, AbstractItem newItem, File destDir) throws IOException {
|
||||
newItem.onLoad(destination, name);
|
||||
}
|
||||
|
||||
/**
|
||||
* A pointless function to work around what appears to be a HotSpot problem. See JENKINS-5756 and bug 6933067
|
||||
* on BugParade for more details.
|
||||
@@ -733,4 +738,5 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
|
||||
* Replaceable pronoun of that points to a job. Defaults to "Job"/"Project" depending on the context.
|
||||
*/
|
||||
public static final Message<AbstractItem> PRONOUN = new Message<AbstractItem>();
|
||||
|
||||
}
|
||||
@@ -381,7 +381,7 @@ public class Items {
|
||||
FileUtils.moveDirectory(item.getRootDir(), destDir);
|
||||
oldParent.remove(item);
|
||||
I newItem = destination.add(item, name);
|
||||
newItem.onLoad(destination, name);
|
||||
item.movedTo(destination, newItem, destDir);
|
||||
ItemListener.fireLocationChange(newItem, oldFullName);
|
||||
return newItem;
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@ import hudson.widgets.HistoryWidget;
|
||||
import hudson.widgets.HistoryWidget.Adapter;
|
||||
import hudson.widgets.Widget;
|
||||
import jenkins.model.BuildDiscarder;
|
||||
import jenkins.model.DirectlyModifiableTopLevelItemGroup;
|
||||
import jenkins.model.Jenkins;
|
||||
import jenkins.model.ProjectNamingStrategy;
|
||||
import jenkins.security.HexStringConfidentialKey;
|
||||
@@ -70,6 +71,7 @@ import jenkins.util.io.OnMaster;
|
||||
import net.sf.json.JSONException;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.jfree.chart.ChartFactory;
|
||||
import org.jfree.chart.JFreeChart;
|
||||
import org.jfree.chart.axis.CategoryAxis;
|
||||
@@ -628,6 +630,18 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void movedTo(DirectlyModifiableTopLevelItemGroup destination, AbstractItem newItem, File destDir) throws IOException {
|
||||
Job newJob = (Job) newItem; // Missing covariant parameters type here.
|
||||
File oldBuildDir = getBuildDir();
|
||||
super.movedTo(destination, newItem, destDir);
|
||||
File newBuildDir = getBuildDir();
|
||||
if (oldBuildDir.isDirectory() && !newBuildDir.isDirectory()) {
|
||||
FileUtils.forceMkdir(destDir.getParentFile());
|
||||
FileUtils.moveDirectory(oldBuildDir, newBuildDir);
|
||||
}
|
||||
}
|
||||
|
||||
@Override public void delete() throws IOException, InterruptedException {
|
||||
super.delete();
|
||||
Util.deleteRecursive(getBuildDir());
|
||||
|
||||
Reference in new issue
Block a user